Download as
Browse Code »

Commit 025330d8fa86e08ddc6c70a48874df00524fea2f

Authored by Braulio Bhavamitra
1 parent c4cde510
Exists in master and in 28 other branches 1.2+SPB2, 2_split_by_role, add_fields_in_api, api_fixies, api_pagination, api_private_token, api_tasks, article_hit_count, blog_page_bug, checkbox_to_user_can_edit_page, communities_ratings, communities_ratings_moderation, community_ratings_rebase, fix_cloned_article_parent, fix_gallery_image_url, fix_javascript_categories, fix_optional_fields, fix_suggest_article, fix_user_email_validation, highlight_block_fix, notification_plugin, notification_plugin_rebase, script_to_update, split_by_role, stable, temp_ratings, tests, tests_fixies

Revert "Revert "Fixing method with new solr search"" 

This reverts commit 4a1e090a5e3d20bb88fe587183699a00fe27d356.
Showing 2 changed files with 2 additions and 1 deletions   Show diff stats
app/controllers/my_profile/cms_controller.rb
  Diff comments   View file @025330d
@@ -294,7 +294,7 @@ class CmsController < MyProfileController @@ -294,7 +294,7 @@ class CmsController < MyProfileController
294 294
295 def search 295 def search
296 query = params[:q] 296 query = params[:q]
297 - results = query.blank? ? [] : profile.articles.published.find_by_contents(query) 297 + results = query.blank? ? [] : profile.articles.published.find_by_contents(query)[:results]
298 render :text => article_list_to_json(results), :content_type => 'application/json' 298 render :text => article_list_to_json(results), :content_type => 'application/json'
299 end 299 end
300 def media_upload 300 def media_upload
test/functional/cms_controller_test.rb
  Diff comments   View file @025330d
@@ -9,6 +9,7 @@ class CmsControllerTest < Test::Unit::TestCase @@ -9,6 +9,7 @@ class CmsControllerTest < Test::Unit::TestCase
9 fixtures :environments 9 fixtures :environments
10 10
11 def setup 11 def setup
  12 + Test::Unit::TestCase::setup
12 @controller = CmsController.new 13 @controller = CmsController.new
13 @request = ActionController::TestRequest.new 14 @request = ActionController::TestRequest.new
14 @request.stubs(:ssl?).returns(true) 15 @request.stubs(:ssl?).returns(true)