From 72f615dd050b45dc645e8d31d9cc1ebd26f9bc61 Mon Sep 17 00:00:00 2001 From: ParleyMartins Date: Tue, 28 Oct 2014 11:27:37 -0200 Subject: [PATCH] Link Institution Block view all to institution search --- lib/institutions_block.rb | 4 ++-- lib/mpog_software_plugin.rb | 13 +++++++++++++ 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/lib/institutions_block.rb b/lib/institutions_block.rb index 9f5db10..da31721 100644 --- a/lib/institutions_block.rb +++ b/lib/institutions_block.rb @@ -21,11 +21,11 @@ class InstitutionsBlock < CommunitiesBlock case owner when Profile lambda do |context| - link_to s_('institutions|View all'), :profile => owner.identifier, :controller => 'profile', :action => 'communities' + link_to s_('institutions|View all'), :profile => owner.identifier, :controller => 'profile', :action => 'communities', :type => 'Institution' end when Environment lambda do |context| - link_to s_('institutions|View all'), :controller => 'search', :action => 'communities' + link_to s_('institutions|View all'), :controller => 'search', :action => 'communities', :type => 'Institution' end else '' diff --git a/lib/mpog_software_plugin.rb b/lib/mpog_software_plugin.rb index e39026a..d399204 100644 --- a/lib/mpog_software_plugin.rb +++ b/lib/mpog_software_plugin.rb @@ -161,6 +161,19 @@ class MpogSoftwarePlugin < Noosfero::Plugin @search = results render :action => :communities end + + if params[:type] == "Institution" + institutions = Institution.search_institution(params[:intitution_name]) + communities = [] + institutions.each do |s| + communities << s.community + end + results = communities + results = results.paginate(:per_page => 24, :page => params[:page]) + @searches[@asset] = {:results => results} + @search = results + render :action => :communities + end end people_block = proc do -- libgit2 0.21.2