Download as
Browse Code »

Commit e2cc01db0a0cf4338cded840d0740ffa855af40e

Authored by Victor Costa
2 parents 3d9ba6b1 62a74f33
Exists in staging and in 4 other branches captcha_serpro_plugin, login-captcha, production, production-vendorized

Merge branch 'processed_tasks' into production 

Conflicts:
	app/controllers/my_profile/tasks_controller.rb
	public/stylesheets/tasks.css
Showing 1 changed file with 1 additions and 1 deletions   Show diff stats
app/controllers/my_profile/tasks_controller.rb
  Diff comments   View file @e2cc01d
... ... @@ -36,7 +36,7 @@ class TasksController < MyProfileController
36 36 @filter_closed_from = Date.parse(params[:filter_closed_from]) unless params[:filter_closed_from].blank?
37 37 @filter_closed_until = Date.parse(params[:filter_closed_until]) unless params[:filter_closed_until].blank?
38 38  
39   - @tasks = Task.to(profile).without_spam.closed.order(:created_at)
  39 + @tasks = Task.to(profile).without_spam.closed.order('tasks.created_at DESC')
40 40 @tasks = @tasks.of(@filter_type)
41 41 @tasks = @tasks.where(:status => params[:filter_status]) unless @filter_status.blank?
42 42 @tasks = @tasks.where('tasks.created_at >= ?', @filter_created_from.beginning_of_day) unless @filter_created_from.blank?
... ...