Download as
Browse Code »

Commit 72f615dd050b45dc645e8d31d9cc1ebd26f9bc61

Authored by Parley
Committed by Gabriela Navarro
1 parent be2a533f
Exists in master and in 79 other branches add_sisp_to_chef, add_super_archives_plugin, api_for_colab, automates_core_packing, backup_not_prod, changes_in_buttons_on_content_panel, colab_automated_login, colab_spb_plugin_recipe, colab_widgets_settings, design_validation, dev_env_minimal, disable_email_dev, fix_breadcrumbs_position, fix_categories_software_link, fix_edit_institution, fix_edit_software_with_another_license, fix_get_license_info, fix_gitlab_assets_permission, fix_list_style_inside_article, fix_list_style_on_folder_elements, fix_members_pagination, fix_merge_request_url, fix_models_translations, fix_no_license, fix_software_api, fix_software_block_migration, fix_software_communities_translations, fix_software_communities_unit_test, fix_style_create_institution_admin_panel, fix_superarchives_imports, fix_sym_links_noosfero, focus_search_field_theme, gov-user-refactoring, gov-user-refactoring-rails4, header_fix, institution_modal_on_rating, kalibro-conf-refactoring, kalibro-processor-package, lxc_settings, margin_fix, mezuro_cookbook, prezento, refactor_download_block, refactor_software_communities, refactor_software_for_sisp, register_page, release-process, release-process-v2, remove-unused-images, remove_broken_theme, remove_secondary_email_from_user, remove_sisp_buttons, removing_super_archives_email, review_message, scope2method, signals_user_noosfero, sisp_catalog_header, sisp_colab_config, sisp_dev, sisp_dev_master, sisp_simple_version, software_as_organization, software_catalog_style_fix, software_communities_html_refactor, software_infos_api, spb_minimal_env, spb_to_rails4, spec_refactor, stable-4.1, stable-4.2, stable-4.x, temp_soft_comm_refactoring, theme_header, theme_javascript_refactory, thread_dropdown, thread_page, update_search_by_categories, update_software_api, update_softwares_boxes

Link Institution Block view all to institution search 

Signed-off-by: Parley Martins <parley@outlook.com>
Signed-off-by: Gustavo Jaruga <darksshades@gmail.com>
Showing 2 changed files with 15 additions and 2 deletions   Show diff stats
lib/institutions_block.rb
  Diff comments   View file @72f615d
@@ -21,11 +21,11 @@ class InstitutionsBlock &lt; CommunitiesBlock @@ -21,11 +21,11 @@ class InstitutionsBlock &lt; CommunitiesBlock
21 case owner 21 case owner
22 when Profile 22 when Profile
23 lambda do |context| 23 lambda do |context|
24 - link_to s_('institutions|View all'), :profile => owner.identifier, :controller => 'profile', :action => 'communities' 24 + link_to s_('institutions|View all'), :profile => owner.identifier, :controller => 'profile', :action => 'communities', :type => 'Institution'
25 end 25 end
26 when Environment 26 when Environment
27 lambda do |context| 27 lambda do |context|
28 - link_to s_('institutions|View all'), :controller => 'search', :action => 'communities' 28 + link_to s_('institutions|View all'), :controller => 'search', :action => 'communities', :type => 'Institution'
29 end 29 end
30 else 30 else
31 '' 31 ''
lib/mpog_software_plugin.rb
  Diff comments   View file @72f615d
@@ -161,6 +161,19 @@ class MpogSoftwarePlugin &lt; Noosfero::Plugin @@ -161,6 +161,19 @@ class MpogSoftwarePlugin &lt; Noosfero::Plugin
161 @search = results 161 @search = results
162 render :action => :communities 162 render :action => :communities
163 end 163 end
  164 +
  165 + if params[:type] == "Institution"
  166 + institutions = Institution.search_institution(params[:intitution_name])
  167 + communities = []
  168 + institutions.each do |s|
  169 + communities << s.community
  170 + end
  171 + results = communities
  172 + results = results.paginate(:per_page => 24, :page => params[:page])
  173 + @searches[@asset] = {:results => results}
  174 + @search = results
  175 + render :action => :communities
  176 + end
164 end 177 end
165 178
166 people_block = proc do 179 people_block = proc do