From 645ebe3d40e6a148dca52054e91483253b3d7568 Mon Sep 17 00:00:00 2001
From: Jochen Wiedmann <jochen.wiedmann@gmail.com>
Date: Wed, 27 Apr 2011 15:20:55 -0700
Subject: Bug 423612 - Allow editing extern_id for users from the admin
 interface r=mkanat, a=mkanat

---
 template/en/default/admin/users/userdata.html.tmpl | 13 +++++++++++++
 template/en/default/global/messages.html.tmpl      |  2 ++
 template/en/default/global/user-error.html.tmpl    |  8 ++++++++
 3 files changed, 23 insertions(+)

(limited to 'template')

diff --git a/template/en/default/admin/users/userdata.html.tmpl b/template/en/default/admin/users/userdata.html.tmpl
index 5df1f7c8c..f3f0e5aa9 100644
--- a/template/en/default/admin/users/userdata.html.tmpl
+++ b/template/en/default/admin/users/userdata.html.tmpl
@@ -38,6 +38,19 @@
     [% END %]
   </td>
 </tr>
+[% IF default_authorizer.extern_id_used %]
+  <tr>
+    <th><label for="extern_id">External Login ID:</label></th>
+    <td>
+      [% IF editusers %]
+        <input size="64" maxlength="64" name="extern_id"
+               id="extern_id" value="[% otheruser.extern_id FILTER html %]">
+      [% ELSE %]
+        [% otheruser.extern_id FILTER html %]
+      [% END %]
+    </td>
+  </tr>
+[% END %]
 <tr>
   <th><label for="name">Real name:</label></th>
   <td>
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 %]
-- 
cgit v1.2.3-24-g4f1b