Commit 72f615dd050b45dc645e8d31d9cc1ebd26f9bc61
Committed by
Gabriela Navarro
1 parent
be2a533f
Exists in
master
and in
5 other branches
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
... | ... | @@ -21,11 +21,11 @@ class InstitutionsBlock < CommunitiesBlock |
21 | 21 | case owner |
22 | 22 | when Profile |
23 | 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 | 25 | end |
26 | 26 | when Environment |
27 | 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 | 29 | end |
30 | 30 | else |
31 | 31 | '' | ... | ... |
lib/mpog_software_plugin.rb
... | ... | @@ -161,6 +161,19 @@ class MpogSoftwarePlugin < Noosfero::Plugin |
161 | 161 | @search = results |
162 | 162 | render :action => :communities |
163 | 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 | 177 | end |
165 | 178 | |
166 | 179 | people_block = proc do | ... | ... |