Download as
Browse Code »

Commit 0635131e0973c09cb28b11b18a7cf0de40f59851

Authored by Gust
Committed by Fabio Teixeira
1 parent c9cdb24a
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

Only show software button on software, fix edit 

-Fix edit community page on software
-Only show software button on communities with software

Signed-off-by: Gabriela Navarro <navarro1703@gmail.com>
Signed-off-by: Gustavo Jaruga Cruz <darksshades@gmail.com>
Showing 1 changed file with 5 additions and 3 deletions   Show diff stats
lib/mpog_software_plugin.rb
  Diff comments   View file @0635131
@@ -56,8 +56,6 @@ class MpogSoftwarePlugin &lt; Noosfero::Plugin @@ -56,8 +56,6 @@ class MpogSoftwarePlugin &lt; Noosfero::Plugin
56 def profile_editor_extras 56 def profile_editor_extras
57 if context.profile.person? 57 if context.profile.person?
58 expanded_template('person_editor_extras.html.erb') 58 expanded_template('person_editor_extras.html.erb')
59 - elsif context.profile.respond_to? :software_info and !context.profile.software_info.nil?  
60 - expanded_template('software_editor_extras.html.erb')  
61 elsif context.profile.respond_to? :institution and !context.profile.institution.nil? 59 elsif context.profile.respond_to? :institution and !context.profile.institution.nil?
62 @show_sisp_field = show_sisp_field 60 @show_sisp_field = show_sisp_field
63 expanded_template('institution_editor_extras.html.erb') 61 expanded_template('institution_editor_extras.html.erb')
@@ -198,7 +196,11 @@ class MpogSoftwarePlugin &lt; Noosfero::Plugin @@ -198,7 +196,11 @@ class MpogSoftwarePlugin &lt; Noosfero::Plugin
198 end 196 end
199 197
200 def control_panel_buttons 198 def control_panel_buttons
201 - return { :title => _("Software Info"), :icon => "edit-profile-group", :url => {:controller => "mpog_software_plugin_myprofile", :action => "edit_software"} } 199 + if context.profile.software?
  200 + return { :title => _("Software Info"), :icon => "edit-profile-group", :url => {:controller => "mpog_software_plugin_myprofile", :action => "edit_software"} }
  201 + else
  202 + return nil
  203 + end
202 end 204 end
203 205
204 def stylesheet? 206 def stylesheet?