diff --git a/app/controllers/my_profile/tasks_controller.rb b/app/controllers/my_profile/tasks_controller.rb index 4ca40d9..886f7a0 100644 --- a/app/controllers/my_profile/tasks_controller.rb +++ b/app/controllers/my_profile/tasks_controller.rb @@ -22,6 +22,7 @@ class TasksController < MyProfileController def processed @filter_requestor = params[:filter_requestor].presence + @filter_closed_by = params[:filter_closed_by].presence @filter_type = params[:filter_type].presence @filter_text = params[:filter_text].presence @filter_status = params[:filter_status].presence @@ -36,6 +37,8 @@ class TasksController < MyProfileController @tasks = @tasks.where('tasks.created_at >= ?', @filter_created_from.beginning_of_day) unless @filter_created_from.blank? @tasks = @tasks.where('tasks.created_at <= ?', @filter_created_until.end_of_day) unless @filter_created_until.blank? @tasks = @tasks.joins(:requestor).like('profiles.name', @filter_requestor) unless @filter_requestor.blank? + @tasks = @tasks.joins(:closed_by).like('closed_bies_tasks.name', @filter_closed_by) unless @filter_closed_by.blank? + @tasks = @tasks.like('tasks.data', @filter_text) unless @filter_text.blank? @tasks = @tasks.paginate(:per_page => Task.per_page, :page => params[:page]) diff --git a/app/views/tasks/processed.html.erb b/app/views/tasks/processed.html.erb index ade81e8..d5d2823 100644 --- a/app/views/tasks/processed.html.erb +++ b/app/views/tasks/processed.html.erb @@ -16,7 +16,11 @@