Download as
Browse Code »

Commit 760ea10e93091b38adee02f848def06b0986df60

Authored by Fabio Teixeira
Committed by Gabriela Navarro
1 parent e682f9c1
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

fix_institution: Show SISP option when user is admin 

Signed-off-by: Fabio Teixeira <fabio1079@gmail.com>
Signed-off-by: Gabriela Navarro <navarro1703@gmail.com>
Showing 3 changed files with 6 additions and 2 deletions   Show diff stats
controllers/mpog_software_plugin_controller.rb
  Diff comments   View file @760ea10
@@ -39,6 +39,8 @@ class MpogSoftwarePluginController &lt; ApplicationController @@ -39,6 +39,8 @@ class MpogSoftwarePluginController &lt; ApplicationController
39 end 39 end
40 40
41 def create_institution 41 def create_institution
  42 + @show_sisp_field = environment.admins.include?(current_user.person)
  43 +
42 if request.xhr? 44 if request.xhr?
43 render :layout=>false 45 render :layout=>false
44 else 46 else
@@ -54,6 +56,8 @@ class MpogSoftwarePluginController &lt; ApplicationController @@ -54,6 +56,8 @@ class MpogSoftwarePluginController &lt; ApplicationController
54 end 56 end
55 57
56 def create_institution_admin 58 def create_institution_admin
  59 + @show_sisp_field = environment.admins.include?(current_user.person)
  60 +
57 @url_token = split_http_referer request.original_url() 61 @url_token = split_http_referer request.original_url()
58 end 62 end
59 63
public/mpog-institution-validations.js
  Diff comments   View file @760ea10
@@ -223,7 +223,7 @@ @@ -223,7 +223,7 @@
223 223
224 jQuery("#create_institution_link").click(open_create_institution_modal); 224 jQuery("#create_institution_link").click(open_create_institution_modal);
225 225
226 - jQuery("input[type='radio']").click(institution_type_actions); 226 + jQuery("input[type='radio'][name='institutions[type]']").click(institution_type_actions);
227 227
228 jQuery('#save_institution_button').click(save_institution); 228 jQuery('#save_institution_button').click(save_institution);
229 229
views/mpog_software_plugin/_institution.html.erb
  Diff comments   View file @760ea10
@@ -98,7 +98,7 @@ @@ -98,7 +98,7 @@
98 <%= inst.label("sisp" ,_("Yes")) %> 98 <%= inst.label("sisp" ,_("Yes")) %>
99 <%= inst.radio_button(:sisp, true) %> 99 <%= inst.radio_button(:sisp, true) %>
100 <%= inst.label("sisp" ,_("No")) %> 100 <%= inst.label("sisp" ,_("No")) %>
101 - <%= inst.radio_button(:sisp, false) %> 101 + <%= inst.radio_button(:sisp, false, :checked=>"checked") %>
102 <% else %> 102 <% else %>
103 <%= inst.label("sisp", _("No")) %> 103 <%= inst.label("sisp", _("No")) %>
104 <% end %> 104 <% end %>