Bug 119485 : Templatise editusers.cgi

Patch by Marc Schumann <wurblzap@gmail.com>   r=GavinS, mkanat  a=justdave

3 files changed, 90 insertions, 2 deletions

diff --git a/template/en/default/global/code-error.html.tmpl b/template/en/default/global/code-error.html.tmpl
index 3a2a9606e..259be667c 100644
--- a/template/en/default/global/code-error.html.tmpl
+++ b/template/en/default/global/code-error.html.tmpl
@@ -185,7 +185,11 @@
   [% ELSIF error == "invalid_keyword_id" %]
     The keyword ID <em>[% id FILTER html %]</em> couldn't be
     found.
-    
+
+  [% ELSIF error == "invalid_user_id" %]
+    [% title = "Invalid User ID" %]
+    There is no user account with ID <em>[% userid FILTER html %]</em>.
+
   [% ELSIF error == "missing_bug_id" %]
     No [% terms.bug %] ID was given.
     
diff --git a/template/en/default/global/messages.html.tmpl b/template/en/default/global/messages.html.tmpl
index ba1476300..5ed2eecf8 100644
--- a/template/en/default/global/messages.html.tmpl
+++ b/template/en/default/global/messages.html.tmpl
@@ -30,7 +30,77 @@
 [% message_tag = message %]
 
 [% message = BLOCK %]
-  [% IF    message_tag == "buglist_adding_field" %]
+  [% IF    message_tag == "account_created" %]
+    [% title = "User $otheruser.login created" %]
+    A new user account [% otheruser.login FILTER html %] has been created
+    successfully.
+    [% IF groups.size %]
+      You may want to edit the group settings now, using the form below.
+    [% END %]
+
+  [% ELSIF message_tag == "account_updated" %]
+    [% IF changed_fields.size
+          + groups_added_to.size + groups_removed_from.size
+          + groups_granted_rights_to_bless.size + groups_denied_rights_to_bless.size %]
+      [% title = "User $loginold updated" %]
+      The following changes have been made to the user account
+      [%+ loginold FILTER html %]:
+      <ul>
+        [% FOREACH field = changed_fields %]
+          <li>
+            [% IF    field == 'login_name' %]
+              The login is now [% otheruser.login FILTER html %].
+            [% ELSIF field == 'realname' %]
+              The real name has been updated.
+            [% ELSIF field == 'cryptpassword' %]
+              A new password has been set.
+            [% ELSIF field == 'disabledtext' %]
+              The disable text has been modified.
+            [% END %]
+          </li>
+        [% END %]
+        [% IF groups_added_to.size %]
+          <li>
+            The account has been added to the
+            [%+ groups_added_to.join(', ') FILTER html %]
+            group[% 's' IF groups_added_to.size > 1 %].
+          </li>
+        [% END %]
+        [% IF groups_removed_from.size %]
+          <li>
+            The account has been removed from the
+            [%+ groups_removed_from.join(', ') FILTER html %]
+            group[% 's' IF groups_removed_from.size > 1 %].
+          </li>
+        [% END %]
+        [% IF groups_granted_rights_to_bless.size %]
+          <li>
+            The account has been granted rights to bless the
+            [%+ groups_granted_rights_to_bless.join(', ') FILTER html %]
+            group[% 's' IF groups_granted_rights_to_bless.size > 1 %].
+          </li>
+        [% END %]
+        [% IF groups_denied_rights_to_bless.size %]
+          <li>
+            The account has been denied rights to bless the
+            [%+ groups_denied_rights_to_bless.join(', ') FILTER html %]
+            group[% 's' IF groups_denied_rights_to_bless.size > 1 %].
+          </li>
+        [% END %]
+      </ul>
+    [% ELSE %]
+      [% title = "User $otheruser.login not changed" %]
+      You didn't request any change on the user account
+      [%+ otheruser.login FILTER html %].
+    [% END %]
+    [%# changed_fields.join(', ') %]
+
+  [% ELSIF message_tag == "account_deleted" %]
+    [% title = "User $otheruser.login deleted" %]
+    The user account [% otheruser.login FILTER html %] has been deleted
+    successfully.
+
+  [% ELSIF message_tag == "buglist_adding_field" %]
     [% title = "Adding field to search page..." %]
     [% link  = "Click here if the page does not redisplay automatically." %]
 
diff --git a/template/en/default/global/user-error.html.tmpl b/template/en/default/global/user-error.html.tmpl
index e0d43b5b1..eba6e97c6 100644
--- a/template/en/default/global/user-error.html.tmpl
+++ b/template/en/default/global/user-error.html.tmpl
@@ -108,6 +108,8 @@
       [% IF group %] and [% END %]
       [% IF reason == "cant_bless" %]
         you don't have permissions to put people in or out of any group,
+      [% ELSIF reason == "not_visible" %]
+        there are visibility restrictions on certain user groups,
       [% END %]
     [% END %]
 
@@ -146,6 +148,8 @@
       products
     [% ELSIF object == "reports" %]
       whine reports
+    [% ELSIF object == "user" %]
+      the user you specified
     [% ELSIF object == "users" %]
       users
     [% ELSIF object == "versions" %]
@@ -1046,6 +1050,16 @@
     [% title = "Deletion not activated" %]
     Sorry, the deletion of user accounts is not allowed.
 
+  [% ELSIF error == "user_has_responsibility" %]
+    [% title = "Can't Delete User Account" %]
+    The user you want to delete is set up for roles as initial [% terms.bug %]
+    owner or QA contact for at least one component.
+    For this reason, you cannot delete the account at this time.
+
+  [% ELSIF error == "user_login_required" %]
+    [% title = "Login Name Required" %]
+    You must enter a login name for the new user.
+
   [% ELSIF error == "votes_must_be_nonnegative" %]
     [% title = "Votes Must Be Non-negative" %]
     Only use non-negative numbers for your [% terms.bug %] votes.