Download as
Browse Code »

Commit 74f7762e627f4bbbc35301169cbe8c066313d076

Authored by David Silva
1 parent 93034cba
Exists in master and in 5 other branches fix_search_by_software_highlight_block, r4, refactor_software_info_365, stable, update_translations

Small refactors in mpog_software_plugin file. 

Signed-off-by: Arthur Del Esposte <arthurmde@gmail.com>
Signed-off-by: David Calos <ddavidcarlos1392@gmail.com>
Showing 1 changed file with 38 additions and 25 deletions   Show diff stats
lib/mpog_software_plugin.rb
  Diff comments   View file @74f7762
@@ -65,7 +65,7 @@ class MpogSoftwarePlugin &lt; Noosfero::Plugin @@ -65,7 +65,7 @@ class MpogSoftwarePlugin &lt; Noosfero::Plugin
65 [{ 65 [{
66 :type => "before_filter", 66 :type => "before_filter",
67 :method_name => "validate_institution_sisp_field_access", 67 :method_name => "validate_institution_sisp_field_access",
68 - :options => { :only=>:edit }, 68 + :options => { :only => :edit },
69 :block => block 69 :block => block
70 }] 70 }]
71 end 71 end
@@ -87,32 +87,11 @@ class MpogSoftwarePlugin &lt; Noosfero::Plugin @@ -87,32 +87,11 @@ class MpogSoftwarePlugin &lt; Noosfero::Plugin
87 87
88 def control_panel_buttons 88 def control_panel_buttons
89 if context.profile.software? 89 if context.profile.software?
90 - return {  
91 - :title => _("Software Info"),  
92 - :icon => "edit-profile-group control-panel-software-link",  
93 - :url => {  
94 - :controller => "mpog_software_plugin_myprofile",  
95 - :action => "edit_software"  
96 - }  
97 - } 90 + return software_info_button
98 elsif context.profile.person? 91 elsif context.profile.person?
99 - return {  
100 - :title => _("Create a new software"),  
101 - :icon => "design-editor",  
102 - :url => {  
103 - :controller => "mpog_software_plugin_myprofile",  
104 - :action => "new_software"  
105 - }  
106 - }  
107 - return nil 92 + return create_new_software_button
108 elsif context.profile.institution? 93 elsif context.profile.institution?
109 - return {  
110 - :title => _("Institution Info"),  
111 - :icon => "edit-profile-group control-panel-instituton-link",  
112 - :url => {  
113 - :controller => "mpog_software_plugin_myprofile",  
114 - :action => "edit_institution"}  
115 - } 94 + return institution_info_button
116 end 95 end
117 end 96 end
118 97
@@ -444,4 +423,38 @@ class MpogSoftwarePlugin &lt; Noosfero::Plugin @@ -444,4 +423,38 @@ class MpogSoftwarePlugin &lt; Noosfero::Plugin
444 context.profile.institution.send(model + '_id = ', context.params[model.to_sym]) 423 context.profile.institution.send(model + '_id = ', context.params[model.to_sym])
445 context.profile.institution.save! 424 context.profile.institution.save!
446 end 425 end
  426 +
  427 +
  428 + def software_info_button
  429 + {
  430 + :title => _("Software Info"),
  431 + :icon => "edit-profile-group control-panel-software-link",
  432 + :url => {
  433 + :controller => "mpog_software_plugin_myprofile",
  434 + :action => "edit_software"
  435 + }
  436 + }
  437 + end
  438 +
  439 + def create_new_software_button
  440 + {
  441 + :title => _("Create a new software"),
  442 + :icon => "design-editor",
  443 + :url => {
  444 + :controller => "mpog_software_plugin_myprofile",
  445 + :action => "new_software"
  446 + }
  447 + }
  448 + end
  449 +
  450 + def institution_info_button
  451 + {
  452 + :title => _("Institution Info"),
  453 + :icon => "edit-profile-group control-panel-instituton-link",
  454 + :url => {
  455 + :controller => "mpog_software_plugin_myprofile",
  456 + :action => "edit_institution"
  457 + }
  458 + }
  459 + end
447 end 460 end