Merge branch 'limit-tag-search' into 'master'

Put limit on tag search See merge request !553

Merge branch 'limit-tag-search' into 'master'
Put limit on tag search See merge request !553
Braulio Bhavamitra
2 parents abbed37f 3e3dcb24
Showing 2 changed files with 3 additions and 3 deletions Show diff stats
app/controllers/my_profile/cms_controller.rb
test/functional/cms_controller_test.rb
@@ -6,7 +6,7 @@ class CmsController &lt; MyProfileController
   def search_tags
     arg = params[:term].downcase
-    result = ActsAsTaggableOn::Tag.find(:all, :conditions => ['LOWER(name) LIKE ?', "%#{arg}%"])
+    result = ActsAsTaggableOn::Tag.where('name ILIKE ?', "%#{arg}%").limit(10)
     render :text => prepare_to_token_input_by_label(result).to_json, :content_type => 'application/json'
   end
@@ -1891,8 +1891,8 @@ class CmsControllerTest &lt; ActionController::TestCase
   end
   should 'return tags found' do
-    tag = mock; tag.stubs(:name).returns('linux')
-    ActsAsTaggableOn::Tag.stubs(:find).returns([tag])
+    a = profile.articles.create(:name => 'blablabla')
+    a.tags.create! name: 'linux'
     get :search_tags, :profile => profile.identifier, :term => 'linux'
     assert_equal '[{"label":"linux","value":"linux"}]', @response.body
   end
	@@ -6,7 +6,7 @@ class CmsController < MyProfileController		@@ -6,7 +6,7 @@ class CmsController < MyProfileController
6		6
7	def search_tags	7	def search_tags
8	arg = params[:term].downcase	8	arg = params[:term].downcase
9	- result = ActsAsTaggableOn::Tag.find(:all, :conditions => ['LOWER(name) LIKE ?', "%#{arg}%"])	9	+ result = ActsAsTaggableOn::Tag.where('name ILIKE ?', "%#{arg}%").limit(10)
10	render :text => prepare_to_token_input_by_label(result).to_json, :content_type => 'application/json'	10	render :text => prepare_to_token_input_by_label(result).to_json, :content_type => 'application/json'
11	end	11	end
12		12