Prevent throwing server error when filtering activities with invalid …

…dates
dradis · Feb 5, 2024 · 45d57ad · 45d57ad
1 parent 5167e10
commit 45d57ad
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/app/controllers/activities_controller.rb b/app/controllers/activities_controller.rb
@@ -42,10 +42,10 @@ def filter_activities(activities)
       next if value.blank?
 
       if key == 'since'
-        value = DateTime.parse(value).beginning_of_day
+        value = DateTime.parse(value).beginning_of_day rescue ArgumentError
         activities = activities.since value
       elsif key == 'before'
-        value = DateTime.parse(value).end_of_day
+        value = DateTime.parse(value).end_of_day rescue ArgumentError
         activities = activities.before value
       elsif ['user_id', 'trackable_type'].include? key
         activities = activities.where(key.to_sym => value)