diff options
| author | Dylan William Hardison <dylan@hardison.net> | 2017-09-25 20:14:31 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-09-25 20:14:31 +0200 |
| commit | 94d888356469f2d920835f9c6d4eba944e429f62 (patch) | |
| tree | a4a123f21ae538261bf53d3593e12fb8d1a3d26b /template/en/default | |
| parent | d827379894e2a5415cdbbb6b30aad0448ba82fb0 (diff) | |
| download | bugzilla-94d888356469f2d920835f9c6d4eba944e429f62.tar.gz bugzilla-94d888356469f2d920835f9c6d4eba944e429f62.tar.xz | |
Bug 1401463 - In bugzilla "you must reset password" state, all bug pages are force-redirected to password reset page, which loses "to-do" information that I have encoded as open tabs viewing particular bug pages
Diffstat (limited to 'template/en/default')
| -rw-r--r-- | template/en/default/account/reset-password.html.tmpl | 16 | ||||
| -rw-r--r-- | template/en/default/global/user-error.html.tmpl | 3 |
2 files changed, 19 insertions, 0 deletions
diff --git a/template/en/default/account/reset-password.html.tmpl b/template/en/default/account/reset-password.html.tmpl index ca60c5772..a2bec34fd 100644 --- a/template/en/default/account/reset-password.html.tmpl +++ b/template/en/default/account/reset-password.html.tmpl @@ -71,6 +71,20 @@ $(function() { <h1>Password Reset</h1> +[% BLOCK link %] + <a href="[% prev_url FILTER html %]">[% prev_url FILTER html %]</a> +[% END %] + +[% IF password_changed && prev_url_ok %] + <p>Continue to [% PROCESS link %]</p> + [% RETURN %] +[% ELSIF prev_url_ok %] + <p> + If you've already reset your password, you may continue to [% PROCESS link %] + </p> +[% END %] + + <p> [% user.password_change_reason || "You are required to update your password." FILTER html %] </p> @@ -82,6 +96,8 @@ $(function() { <form method="POST" action="reset_password.cgi"> <input type="hidden" name="token" value="[% token FILTER html %]"> <input type="hidden" name="do_save" value="1"> +<input type="hidden" name="prev_url" value="[% prev_url FILTER html %]"> +<input type="hidden" name="prev_url_sig" value="[% prev_url_sig FILTER html %]"> <div class="flex"> <div id="password-reset" class="flex-left"> diff --git a/template/en/default/global/user-error.html.tmpl b/template/en/default/global/user-error.html.tmpl index 3e4d7c4a0..9eefbcb73 100644 --- a/template/en/default/global/user-error.html.tmpl +++ b/template/en/default/global/user-error.html.tmpl @@ -1402,6 +1402,9 @@ [% ELSIF error == "reset_password_denied" %] [% title = "Reset Password Denied" %] You cannot reset your password without administrative permission. + [% IF prev_url_ok %] + Continue to <a href="[% prev_url FILTER html %]">[% prev_url FILTER html %]</a>. + [% END %] [% ELSIF error == "no_axes_defined" %] [% title = "No Axes Defined" %] |