diff --git a/cern_integration.info b/cern_integration.info index b3390304a8d6e963a3068acba498778301449699..58d47d726712d93feabd44d22e6b517d4de613d0 100644 --- a/cern_integration.info +++ b/cern_integration.info @@ -1,7 +1,7 @@ name = CERN Integration package = CERN description = Provides CERN site integration for Drupal. -version = "7.X-6" +version = "7.X-1.7" core = 7.x dependencies[] = shib_auth @@ -9,7 +9,6 @@ files[] = cern_integration.module files[] = cern_integration.install project = "cern_integration" -datestamp = "1391098760" +datestamp = "1455099515" required = TRUE - diff --git a/cern_integration.module b/cern_integration.module index 327ea6860bf62083bde14c8af915f8deae379c5d..9819d7ab91a1cd854bc454725037c99beca9e6fb 100644 --- a/cern_integration.module +++ b/cern_integration.module @@ -348,9 +348,10 @@ function cern_integration_form_shib_auth_edit_rule_alter(&$form, &$form_state, $ $txt ="<b>Note: <em>ALWAYS</em> enclose regexp in '^$' to limit possible matches !</b> (example: '^some-e-group-at-cern$')"; $form['shib_auth_new_regexp']['#prefix']=t($txt); - $txt ="<b>Note:</b> If a role is set as 'Sticky' it will be granted to user even if that user is removed from corresponding e-group. Non-sticky roles are not visible in user attributes."; - $form['shib_auth_new_sticky']['#prefix']=t($txt); - + //$txt ="<b>Note:</b> If a role is set as 'Sticky' it will be granted to user even if that user is removed from corresponding e-group. Non-sticky roles are not visible in user attributes."; + //$form['shib_auth_new_sticky']['#prefix']=t($txt); + $form['shib_auth_new_sticky']['#disabled'] = TRUE; + $form['shib_auth_new_sticky']['#value'] = TRUE; } function cern_integration_form_shib_auth_new_rule_alter(&$form, &$form_state, $form_id) { @@ -361,8 +362,10 @@ function cern_integration_form_shib_auth_new_rule_alter(&$form, &$form_state, $f $txt ="<b>Note: <em>ALWAYS</em> enclose regexp in '^$' to limit possible matches !</b> (example: '^some-e-group-at-cern$')"; $form['shib_auth_new_regexp']['#prefix']=t($txt); - $txt ="<b>Note:</b> If a role is set as 'Sticky' it will be granted to user even if that user is removed from corresponding e-group. Non-sticky roles are not visible in user attributes."; - $form['shib_auth_new_sticky']['#prefix']=t($txt); + //$txt ="<b>Note:</b> If a role is set as 'Sticky' it will be granted to user even if that user is removed from corresponding e-group. Non-sticky roles are not visible in user attributes."; + //$form['shib_auth_new_sticky']['#prefix']=t($txt); + $form['shib_auth_new_sticky']['#disabled'] = TRUE; + $form['shib_auth_new_sticky']['#value'] = TRUE; }