Download as
Browse Code »

Commit 39e1c4ef4bb8cc8a36a3cd9a56528e8cb530cbd4

Authored by Victor Costa
2 parents c0bd7efb 0ff5e77c
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
Showing 1 changed file with 3 additions and 3 deletions   Show diff stats
app/controllers/my_profile/tasks_controller.rb
  Diff comments   View file @39e1c4e
... ... @@ -37,13 +37,13 @@ class TasksController < MyProfileController
37 37 @filter_closed_from = Date.parse(params[:filter_closed_from]) unless params[:filter_closed_from].blank?
38 38 @filter_closed_until = Date.parse(params[:filter_closed_until]) unless params[:filter_closed_until].blank?
39 39  
40   - @tasks = Task.to(profile).without_spam.closed.order('tasks.created_at DESC')
  40 + @tasks = Task.to(profile).without_spam.closed.joins([:requestor, :closed_by]).order('tasks.created_at DESC')
41 41 @tasks = @tasks.of(@filter_type)
42 42 @tasks = @tasks.where(:status => params[:filter_status]) unless @filter_status.blank?
43 43 @tasks = @tasks.where('tasks.created_at >= ?', @filter_created_from.beginning_of_day) unless @filter_created_from.blank?
44 44 @tasks = @tasks.where('tasks.created_at <= ?', @filter_created_until.end_of_day) unless @filter_created_until.blank?
45   - @tasks = @tasks.joins(:requestor).like('profiles.name', @filter_requestor) unless @filter_requestor.blank?
46   - @tasks = @tasks.joins(:closed_by).like('closed_bies_tasks.name', @filter_closed_by) unless @filter_closed_by.blank?
  45 + @tasks = @tasks.like('profiles.name', @filter_requestor) unless @filter_requestor.blank?
  46 + @tasks = @tasks.like('closed_bies_tasks.name', @filter_closed_by) unless @filter_closed_by.blank?
47 47  
48 48 @tasks = @tasks.like('tasks.data', @filter_text) unless @filter_text.blank?
49 49  
... ...