diff --git a/app/controllers/my_profile/tasks_controller.rb b/app/controllers/my_profile/tasks_controller.rb index 4ca40d9..22b94c8 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 @@ -30,12 +31,15 @@ class TasksController < MyProfileController @filter_closed_from = Date.parse(params[:filter_closed_from]) unless params[:filter_closed_from].blank? @filter_closed_until = Date.parse(params[:filter_closed_until]) unless params[:filter_closed_until].blank? - @tasks = Task.to(profile).without_spam.closed.order('tasks.created_at DESC') + @tasks = Task.to(profile).without_spam.closed.includes(:requestor, :closed_by).order('tasks.created_at DESC') + @tasks = @tasks.of(@filter_type) @tasks = @tasks.where(:status => params[:filter_status]) unless @filter_status.blank? @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.like('profiles.name', @filter_requestor) unless @filter_requestor.blank? + @tasks = @tasks.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 @@
<%= labelled_text_field(_('Text Filter:'), :filter_text, @filter_text) %> - <%= labelled_text_field(_('Requestor Name:'), :filter_requestor, @filter_requestor) %> +
+ +
+ <%= labelled_text_field(_('Requestor:'), :filter_requestor, @filter_requestor) %> + <%= labelled_text_field(_('Closed by:'), :filter_closed_by, @filter_closed_by) %>
<%= labelled_form_field(_('Creation date'), date_range_field(:filter_created_from, :filter_created_until, @filter_created_from, @filter_created_until, '%Y-%m-%d', { :change_month => true, :change_year => true, :date_format => 'yy-mm-dd' }, { :size => 14, :from_id => 'filter_created_from', :to_id => 'filter_created_until' })) %> -- libgit2 0.21.2