@@ -98,16 +98,17 @@ def audit_log
9898 end
9999 end
100100
101- if params [ :from ] . present? || params [ :to ] . present?
102- from = params [ :from ] || params [ :to ]
103- to = params [ :to ] || params [ :from ] # these lines are deliberate so that if only one is set it's an exact date query
104- @logs = @logs . where ( 'date(created_at) >= ?' , from )
105- . where ( 'date(created_at) <= ?' , to )
101+ if params [ :from ] . present?
102+ @logs = @logs . where ( 'date(created_at) >= ?' , params [ :from ] )
103+ end
104+
105+ if params [ :to ] . present?
106+ @logs = @logs . where ( 'date(created_at) <= ?' , params [ :to ] )
106107 end
107108
108109 @logs = @logs . user_sort ( { term : params [ :sort ] , default : :created_at } ,
109- age : :created_at , type : :log_type , event : :event_type ,
110- related : Arel . sql ( 'related_type DESC, related_id DESC' ) , user : :user_id )
110+ age : :created_at , type : :log_type , event : :event_type ,
111+ related : Arel . sql ( 'related_type DESC, related_id DESC' ) , user : :user_id )
111112 . paginate ( page : @page , per_page : @per_page )
112113
113114 render layout : 'without_sidebar'
0 commit comments