commit/galaxy-central: 2 new changesets
2 new commits in galaxy-central: https://bitbucket.org/galaxy/galaxy-central/commits/8109823f43c3/ Changeset: 8109823f43c3 Branch: next-stable User: dan Date: 2013-10-25 17:51:37 Summary: Fix for Javascript requiring setting a user/public name during registration Affected #: 1 file diff -r 94aea2327373d4cb651e3db3fe5113a5b0c669f5 -r 8109823f43c30a7efa744471b657efbc9624b218 templates/user/register.mako --- a/templates/user/register.mako +++ b/templates/user/register.mako @@ -75,7 +75,7 @@ var error_text_password_short = 'Please use a password of at least 6 characters'; var error_text_password_match = "Passwords don't match"; - var validForm = true; + var validForm = true; var email = $('#email_input').val(); var name = $('#name_input').val() @@ -83,7 +83,7 @@ else if (!validateString(email,"email")){ renderError(error_text_email); validForm = false;} else if (!($('#password_input').val() === $('#password_check_input').val())){ renderError(error_text_password_match); validForm = false;} else if ($('#password_input').val().length < 6 ){ renderError(error_text_password_short); validForm = false;} - else if (!(validateString(name,"username"))){ renderError(error_text_username_characters); validForm = false;} + else if (name && !(validateString(name,"username"))){ renderError(error_text_username_characters); validForm = false;} if (!validForm) { e.preventDefault(); https://bitbucket.org/galaxy/galaxy-central/commits/c432e846d53d/ Changeset: c432e846d53d User: dan Date: 2013-10-25 17:52:03 Summary: merge next-stable Affected #: 3 files diff -r 6865031ea0c473984473e57100f60a3739065ca1 -r c432e846d53d1506dff86d914bb4c513ffaf19d5 templates/user/register.mako --- a/templates/user/register.mako +++ b/templates/user/register.mako @@ -75,7 +75,7 @@ var error_text_password_short = 'Please use a password of at least 6 characters'; var error_text_password_match = "Passwords don't match"; - var validForm = true; + var validForm = true; var email = $('#email_input').val(); var name = $('#name_input').val() @@ -83,7 +83,7 @@ else if (!validateString(email,"email")){ renderError(error_text_email); validForm = false;} else if (!($('#password_input').val() === $('#password_check_input').val())){ renderError(error_text_password_match); validForm = false;} else if ($('#password_input').val().length < 6 ){ renderError(error_text_password_short); validForm = false;} - else if (!(validateString(name,"username"))){ renderError(error_text_username_characters); validForm = false;} + else if (name && !(validateString(name,"username"))){ renderError(error_text_username_characters); validForm = false;} if (!validForm) { e.preventDefault(); Repository URL: https://bitbucket.org/galaxy/galaxy-central/ -- This is a commit notification from bitbucket.org. You are receiving this because you have the service enabled, addressing the recipient of this email.
participants (1)
-
commits-noreply@bitbucket.org