From 760ea10e93091b38adee02f848def06b0986df60 Mon Sep 17 00:00:00 2001 From: Fabio Teixeira Date: Tue, 4 Nov 2014 14:04:22 -0200 Subject: [PATCH] fix_institution: Show SISP option when user is admin --- controllers/mpog_software_plugin_controller.rb | 4 ++++ public/mpog-institution-validations.js | 2 +- views/mpog_software_plugin/_institution.html.erb | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/controllers/mpog_software_plugin_controller.rb b/controllers/mpog_software_plugin_controller.rb index 40df922..655554c 100644 --- a/controllers/mpog_software_plugin_controller.rb +++ b/controllers/mpog_software_plugin_controller.rb @@ -39,6 +39,8 @@ class MpogSoftwarePluginController < ApplicationController end def create_institution + @show_sisp_field = environment.admins.include?(current_user.person) + if request.xhr? render :layout=>false else @@ -54,6 +56,8 @@ class MpogSoftwarePluginController < ApplicationController end def create_institution_admin + @show_sisp_field = environment.admins.include?(current_user.person) + @url_token = split_http_referer request.original_url() end diff --git a/public/mpog-institution-validations.js b/public/mpog-institution-validations.js index 2859912..4b6b7bf 100644 --- a/public/mpog-institution-validations.js +++ b/public/mpog-institution-validations.js @@ -223,7 +223,7 @@ jQuery("#create_institution_link").click(open_create_institution_modal); - jQuery("input[type='radio']").click(institution_type_actions); + jQuery("input[type='radio'][name='institutions[type]']").click(institution_type_actions); jQuery('#save_institution_button').click(save_institution); diff --git a/views/mpog_software_plugin/_institution.html.erb b/views/mpog_software_plugin/_institution.html.erb index f0a1a37..17be5bd 100644 --- a/views/mpog_software_plugin/_institution.html.erb +++ b/views/mpog_software_plugin/_institution.html.erb @@ -98,7 +98,7 @@ <%= inst.label("sisp" ,_("Yes")) %> <%= inst.radio_button(:sisp, true) %> <%= inst.label("sisp" ,_("No")) %> - <%= inst.radio_button(:sisp, false) %> + <%= inst.radio_button(:sisp, false, :checked=>"checked") %> <% else %> <%= inst.label("sisp", _("No")) %> <% end %> -- libgit2 0.21.2