Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Authplugin locked fields now use freeze() method rather than rely on js

based disabledIf().
Thanks to Jamie P and Petr S.
  • Loading branch information...
commit bd749a7c29b52895db4f29e49b642710c2e9202b 1 parent 4cd1267
ikawhero authored
Showing with 8 additions and 5 deletions.
  1. +8 −5 user/edit_form.php
13 user/edit_form.php
View
@@ -241,7 +241,6 @@ function definition () {
}
- //$this->add_action_buttons(false, get_string('updatemyprofile'));
$mform->addElement('submit', 'submitbutton1', get_string('updatemyprofile'));
$mform->closeHeaderBefore('submitbutton1');
@@ -299,15 +298,20 @@ function definition () {
/// disable fields that are locked by auth plugins
if ($userupdate) {
$fields = get_user_fieldnames();
+ $freezefields = array();
foreach ($fields as $field) {
$configvariable = 'field_lock_' . $field;
- if (isset($authplugin->config->{$configvariable})) {
- $mform->disabledIf($field, ( $authplugin->config->{$configvariable} === 'locked' or ($authplugin->config->{$configvariable} === 'unlockedifempty' and !empty($user->$field))), true);
+ if (isset($authplugin->config->{$configvariable}) and
+ ( $authplugin->config->{$configvariable} === 'locked' or
+ ( $authplugin->config->{$configvariable} === 'unlockedifempty' and !empty($user->$field)) ) ) {
+ $freezefields[] = $field;
}
}
+ if (!empty($freezefields)) {
+ $mform->freeze($freezefields);
+ }
}
-
/// Next the customisable categories
if ($categories = get_records_select('user_info_category', '1', 'sortorder ASC')) {
@@ -328,7 +332,6 @@ function definition () {
} /// End of $categories foreach
} /// End of $categories if
- //$this->add_action_buttons(false, get_string('updatemyprofile'));
$mform->addElement('submit', 'submitbutton2', get_string('updatemyprofile'));
$mform->closeHeaderBefore('submitbutton2');
Please sign in to comment.
Something went wrong with that request. Please try again.