From a2034e10873863cb861102a2d408230fd79b4722 Mon Sep 17 00:00:00 2001 From: Gabriela Navarro Date: Tue, 16 Jun 2015 14:40:10 +0000 Subject: [PATCH] Overall fixes: - Search controller to only show communities - Translation from search catalog --- lib/ext/search_controller.rb | 7 ++++++- po/pt/software_communities.po | 2 +- test/functional/search_controller_test.rb | 1 + 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/lib/ext/search_controller.rb b/lib/ext/search_controller.rb index be3de84..a7c4621 100644 --- a/lib/ext/search_controller.rb +++ b/lib/ext/search_controller.rb @@ -7,7 +7,12 @@ class SearchController full_text_search results = @searches[@asset][:results] - results = results.each {|community| !community.software? and !community.institution?} + communities = [] + results.find_each do |community| + communities << community if (!community.software? and !community.institution?) + end + + results = communities.paginate(:per_page => 24, :page => params[:page]) @searches[@asset] = {:results => results} @search = results end diff --git a/po/pt/software_communities.po b/po/pt/software_communities.po index 501e0ac..b70c9e7 100644 --- a/po/pt/software_communities.po +++ b/po/pt/software_communities.po @@ -1091,7 +1091,7 @@ msgid "" "Type words about the software_info you're looking for (the search begins " "after 3 characters)" msgstr "Digite palavras sobre o software que você está procurando (a busca " -"automática começa após 3 letras") +"automática começa após 3 letras)" #: plugins/software_communities/views/search/_software_search_form.html.erb:18 msgid "Filter" diff --git a/test/functional/search_controller_test.rb b/test/functional/search_controller_test.rb index 6f521a5..f06e737 100644 --- a/test/functional/search_controller_test.rb +++ b/test/functional/search_controller_test.rb @@ -75,6 +75,7 @@ class SearchControllerTest < ActionController::TestCase community_template = create_community("New Community Template") community_template.is_template = true + community_template.visible = false community_template.save! get :communities, :query => "New" -- libgit2 0.21.2