Commit dc9394273d0a5bf8185de699a207c4a9ad005742
Exists in
theme-brasil-digital-from-staging
and in
9 other branches
fix merge conflit
Showing
1 changed file
with
3 additions
and
3 deletions
Show diff stats
app/controllers/my_profile/tasks_controller.rb
| @@ -116,9 +116,9 @@ class TasksController < MyProfileController | @@ -116,9 +116,9 @@ class TasksController < MyProfileController | ||
| 116 | end | 116 | end |
| 117 | 117 | ||
| 118 | def search_tasks | 118 | def search_tasks |
| 119 | - | ||
| 120 | - params[:filter_type] = params[:filter_type].blank? ? nil : params[:filter_type] | ||
| 121 | - result = Task.pending_all(profile,params) | 119 | + filter_type = params[:filter_type].presence |
| 120 | + filter_text = params[:filter_text].presence | ||
| 121 | + result = Task.pending_all(profile,filter_type, filter_text) | ||
| 122 | 122 | ||
| 123 | render :json => result.map { |task| {:label => task.data[:name], :value => task.data[:name]} } | 123 | render :json => result.map { |task| {:label => task.data[:name], :value => task.data[:name]} } |
| 124 | end | 124 | end |