Download as
Browse Code »

Commit 90eb5f31d55ae2afa0392314beadd3e469e1694e

Authored by Arthur Esposte
1 parent 2212e3aa
Exists in master and in 5 other branches fix_search_by_software_highlight_block, r4, refactor_software_info_365, stable, update_translations

Refator plugin's hotspot 

Signed-off-by: Arthur Del Esposte <arthurmde@gmail.com>
Signed-off-by: Parley Martins <parley@outlook.com>
Showing 1 changed file with 4 additions and 10 deletions   Show diff stats
lib/mpog_software_plugin.rb
  Diff comments   View file @90eb5f3
@@ -211,7 +211,7 @@ class MpogSoftwarePlugin &lt; Noosfero::Plugin @@ -211,7 +211,7 @@ class MpogSoftwarePlugin &lt; Noosfero::Plugin
211 ["mpog-software-validations.js", "mpog-user-validations.js", "mpog-institution-validations.js", "mpog-incomplete-registration.js", "mpog-search.js"] 211 ["mpog-software-validations.js", "mpog-user-validations.js", "mpog-institution-validations.js", "mpog-incomplete-registration.js", "mpog-search.js"]
212 end 212 end
213 213
214 - def add_new_organization_button 214 + def add_new_organization_buttons
215 Proc::new do 215 Proc::new do
216 button(:add, _('Create a new software'), :controller => 'mpog_software_plugin_myprofile', :action => 'new_software') 216 button(:add, _('Create a new software'), :controller => 'mpog_software_plugin_myprofile', :action => 'new_software')
217 end 217 end
@@ -222,7 +222,7 @@ class MpogSoftwarePlugin &lt; Noosfero::Plugin @@ -222,7 +222,7 @@ class MpogSoftwarePlugin &lt; Noosfero::Plugin
222 person.has_permission_without_plugins?(permission, target) 222 person.has_permission_without_plugins?(permission, target)
223 end 223 end
224 224
225 - def incomplete_registration 225 + def profile_blocks_extra_content
226 return if context.session[:user].nil? or context.session[:hide_incomplete_percentage] == true 226 return if context.session[:user].nil? or context.session[:hide_incomplete_percentage] == true
227 227
228 person = Person.where(:user_id=>context.session[:user]).first 228 person = Person.where(:user_id=>context.session[:user]).first
@@ -236,12 +236,6 @@ class MpogSoftwarePlugin &lt; Noosfero::Plugin @@ -236,12 +236,6 @@ class MpogSoftwarePlugin &lt; Noosfero::Plugin
236 end 236 end
237 end 237 end
238 238
239 -  
240 - def manage_software  
241 - [{:title => _('Manage Software'), :url => {:controller => 'mpog_software_plugin', :action => 'archive_software'}}]  
242 - end  
243 -  
244 -  
245 def custom_user_registration_attributes user 239 def custom_user_registration_attributes user
246 unless context.params[:user][:institution_ids].nil? 240 unless context.params[:user][:institution_ids].nil?
247 context.params[:user][:institution_ids].delete("") 241 context.params[:user][:institution_ids].delete("")
@@ -408,7 +402,7 @@ class MpogSoftwarePlugin &lt; Noosfero::Plugin @@ -408,7 +402,7 @@ class MpogSoftwarePlugin &lt; Noosfero::Plugin
408 def add_new_search_filter 402 def add_new_search_filter
409 if context.params[:action] == "people" 403 if context.params[:action] == "people"
410 expanded_template('search/search_user_filter.html.erb') 404 expanded_template('search/search_user_filter.html.erb')
411 - else context.params[:action] == "communities" 405 + elsif context.params[:action] == "communities"
412 @active_type = if context.params[:type] == "Software" 406 @active_type = if context.params[:type] == "Software"
413 "software" 407 "software"
414 elsif context.params[:type] == "Institution" 408 elsif context.params[:type] == "Institution"
@@ -416,7 +410,7 @@ class MpogSoftwarePlugin &lt; Noosfero::Plugin @@ -416,7 +410,7 @@ class MpogSoftwarePlugin &lt; Noosfero::Plugin
416 else 410 else
417 "community" 411 "community"
418 end 412 end
419 - 413 + puts
420 expanded_template('search/search_community_filter.html.erb') 414 expanded_template('search/search_community_filter.html.erb')
421 end 415 end
422 end 416 end