diff options
| author | Jochen Wiedmann <jochen.wiedmann@gmail.com> | 2011-04-28 00:20:55 +0200 |
|---|---|---|
| committer | Max Kanat-Alexander <mkanat@bugzilla.org> | 2011-04-28 00:20:55 +0200 |
| commit | 645ebe3d40e6a148dca52054e91483253b3d7568 (patch) | |
| tree | df9a0bdb22479b789668a051397a3f5cb658c7ab /template/en/default/global | |
| parent | 6233375db2f69e79f2fa7ba3030956aa2a6eafbe (diff) | |
| download | bugzilla-645ebe3d40e6a148dca52054e91483253b3d7568.tar.gz bugzilla-645ebe3d40e6a148dca52054e91483253b3d7568.tar.xz | |
Bug 423612 - Allow editing extern_id for users from the admin interface
r=mkanat, a=mkanat
Diffstat (limited to 'template/en/default/global')
| -rw-r--r-- | template/en/default/global/messages.html.tmpl | 2 | ||||
| -rw-r--r-- | template/en/default/global/user-error.html.tmpl | 8 |
2 files changed, 10 insertions, 0 deletions
diff --git a/template/en/default/global/messages.html.tmpl b/template/en/default/global/messages.html.tmpl index 5583a961e..0b20be869 100644 --- a/template/en/default/global/messages.html.tmpl +++ b/template/en/default/global/messages.html.tmpl @@ -60,6 +60,8 @@ A new password has been set. [% ELSIF field == 'disabledtext' %] The disable text has been modified. + [% ELSIF field == 'extern_id' %] + The user's External Login ID has been modified. [% ELSIF field == 'disable_mail' %] [% IF otheruser.email_disabled %] [% terms.Bug %]mail has been disabled. diff --git a/template/en/default/global/user-error.html.tmpl b/template/en/default/global/user-error.html.tmpl index 16b66ca84..071599bf8 100644 --- a/template/en/default/global/user-error.html.tmpl +++ b/template/en/default/global/user-error.html.tmpl @@ -1696,6 +1696,14 @@ [% title = "Illegal User ID" %] User ID '[% userid FILTER html %]' is not valid integer. + [% ELSIF error == "extern_id_exists" %] + [% title = "Account Already Exists" %] + There is already an account + [% IF existing_login_name %] + ([% existing_login_name FILTER html %]) + [% END %] + with the External Login ID "[% extern_id FILTER html %]". + [% ELSE %] [%# Try to find hooked error messages %] |