Download as
Browse Code »

Commit 74f7762e627f4bbbc35301169cbe8c066313d076

Authored by David Silva
1 parent 93034cba
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

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 65 [{
66 66 :type => "before_filter",
67 67 :method_name => "validate_institution_sisp_field_access",
68   - :options => { :only=>:edit },
  68 + :options => { :only => :edit },
69 69 :block => block
70 70 }]
71 71 end
... ... @@ -87,32 +87,11 @@ class MpogSoftwarePlugin &lt; Noosfero::Plugin
87 87  
88 88 def control_panel_buttons
89 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 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 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 95 end
117 96 end
118 97  
... ... @@ -444,4 +423,38 @@ class MpogSoftwarePlugin &lt; Noosfero::Plugin
444 423 context.profile.institution.send(model + '_id = ', context.params[model.to_sym])
445 424 context.profile.institution.save!
446 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 460 end
... ...