fix merge conflit

Leandro Santos
2 parents dc9f670f 42406135
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 &lt; MyProfileController
   end
  
   def search_tasks
-
-    params[:filter_type] = params[:filter_type].blank? ? nil : params[:filter_type]
-    result = Task.pending_all(profile,params)
+    filter_type = params[:filter_type].presence
+    filter_text = params[:filter_text].presence
+    result = Task.pending_all(profile,filter_type, filter_text)
  
     render :json => result.map { |task| {:label => task.data[:name], :value => task.data[:name]} }
   end
...	...	@@ -116,9 +116,9 @@ class TasksController < MyProfileController
116	116	end
117	117
118	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	123	render :json => result.map { \|task\| {:label => task.data[:name], :value => task.data[:name]} }
124	124	end
...	...