diff --git a/lms/envs/common.py b/lms/envs/common.py index 86fafd70d7b2a7a51efd2ef8697f90423977ecf8..4cfa792cdd68edc780e7e80d6c1e30090e69e85e 100644 --- a/lms/envs/common.py +++ b/lms/envs/common.py @@ -2815,6 +2815,8 @@ REGISTRATION_FIELD_ORDER = [ "gender", "year_of_birth", "level_of_education", + "specialty", + "profession" "company", "title", "mailing_address", diff --git a/lms/static/js/student_account/views/RegisterView.js b/lms/static/js/student_account/views/RegisterView.js index c0ae569e8f07c1a2cc5b21eeb42584d59eeb25eb..7bd7e5aef396e99d9a46886e6cc9aa5bb988907f 100644 --- a/lms/static/js/student_account/views/RegisterView.js +++ b/lms/static/js/student_account/views/RegisterView.js @@ -274,6 +274,9 @@ handleInputBehavior($input); } }); + $('#register-confirm_email').bind('cut copy paste', function(e) { + e.preventDefault(); + }); setTimeout(handleAutocomplete, 1000); }, diff --git a/openedx/core/djangoapps/user_authn/views/registration_form.py b/openedx/core/djangoapps/user_authn/views/registration_form.py index 6c29b4756d369d5216154e41d816f7156eb7de81..4ce0a8917c22ef6b61aa2b9004a3cf6b31745c87 100644 --- a/openedx/core/djangoapps/user_authn/views/registration_form.py +++ b/openedx/core/djangoapps/user_authn/views/registration_form.py @@ -350,10 +350,11 @@ class RegistrationFormFactory(object): field_order = configuration_helpers.get_value('REGISTRATION_FIELD_ORDER') if not field_order: field_order = settings.REGISTRATION_FIELD_ORDER or valid_fields - - # Check that all of the valid_fields are in the field order and vice versa, if not set to the default order + # Check that all of the valid_fields are in the field order and vice versa, + # if not append missing fields at end of field order if set(valid_fields) != set(field_order): - field_order = valid_fields + difference = set(valid_fields).difference(set(field_order)) + field_order.extend(difference) self.field_order = field_order