diff options
| -rw-r--r-- | CHANGELOG.md | 1 | ||||
| -rw-r--r-- | templates/submit_set_password.html | 2 | ||||
| -rw-r--r-- | www/js/views/submit.js | 2 | ||||
| -rw-r--r-- | www/templates/en/submit_set_password.html | 2 | ||||
| -rw-r--r-- | www/templates/es/submit_set_password.html | 2 |
5 files changed, 5 insertions, 4 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index b2e052b..3007e68 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,7 @@ - Bugfixes - Skip empty report details screen. - Correctly set user title. #156 + - Show more helpful error if server rejects password. #156 - Allow mailto: links to be followed. #263 - Development improvements - CONFIG.SKIP_CONFIRM_REPORT flag to skip confirmation screen diff --git a/templates/submit_set_password.html b/templates/submit_set_password.html index ee681cc..ef06040 100644 --- a/templates/submit_set_password.html +++ b/templates/submit_set_password.html @@ -12,7 +12,7 @@ </p> <div class="inputcard"> <div> - <input data-role="none" type="password" value="" name="password" id="form_password" placeholder="[% loc('Your password') %]" required> + <input data-role="none" type="password" value="<%= FMS.currentUser.get('password') %>" name="password" id="form_password" placeholder="[% loc('Your password') %]" required> </div> </div> <div class="noborder"> diff --git a/www/js/views/submit.js b/www/js/views/submit.js index 4d38aa3..f24f21c 100644 --- a/www/js/views/submit.js +++ b/www/js/views/submit.js @@ -86,7 +86,7 @@ if ( !this._handleInvalid( model, err, options ) ) { var errors = err.errors; var errorList = '<ul><li class="plain">' + FMS.strings.invalid_report + '</li>'; - var validErrors = [ 'password', 'category', 'name' ]; + var validErrors = [ 'password', 'password_register', 'category', 'name' ]; for ( var k in errors ) { if ( validErrors.indexOf(k) >= 0 || errors[k].match(/required/) ) { if ( k === 'password' ) { diff --git a/www/templates/en/submit_set_password.html b/www/templates/en/submit_set_password.html index 1a24eae..75baf7a 100644 --- a/www/templates/en/submit_set_password.html +++ b/www/templates/en/submit_set_password.html @@ -12,7 +12,7 @@ </p> <div class="inputcard"> <div> - <input data-role="none" type="password" value="" name="password" id="form_password" placeholder="Your password" required> + <input data-role="none" type="password" value="<%= FMS.currentUser.get('password') %>" name="password" id="form_password" placeholder="Your password" required> </div> </div> <div class="noborder"> diff --git a/www/templates/es/submit_set_password.html b/www/templates/es/submit_set_password.html index a9d9b46..39403cb 100644 --- a/www/templates/es/submit_set_password.html +++ b/www/templates/es/submit_set_password.html @@ -12,7 +12,7 @@ </p> <div class="inputcard"> <div> - <input data-role="none" type="password" value="" name="password" id="form_password" placeholder="Su contraseña" required> + <input data-role="none" type="password" value="<%= FMS.currentUser.get('password') %>" name="password" id="form_password" placeholder="Su contraseña" required> </div> </div> <div class="noborder"> |