diff options
author | Dave Lawrence <dlawrence@mozilla.com> | 2012-02-08 21:19:05 +0100 |
---|---|---|
committer | Dave Lawrence <dlawrence@mozilla.com> | 2012-02-08 21:19:05 +0100 |
commit | 01e3e73823886636357220f423af08e87af2eba6 (patch) | |
tree | 50894d06b7fbfd72822bd8db17454af97e65b384 /template/en | |
parent | 36dd0f79824db0169d9b996834602dc2c20f1590 (diff) | |
download | bugzilla-01e3e73823886636357220f423af08e87af2eba6.tar.gz bugzilla-01e3e73823886636357220f423af08e87af2eba6.tar.xz |
Bug 533012 - add the ability to see all the administrative actions performed by a user
r=glob
Diffstat (limited to 'template/en')
-rw-r--r-- | template/en/default/account/profile-activity.html.tmpl | 2 | ||||
-rw-r--r-- | template/en/default/admin/users/edit.html.tmpl | 12 | ||||
-rw-r--r-- | template/en/default/admin/users/list.html.tmpl | 11 | ||||
-rw-r--r-- | template/en/default/global/user-error.html.tmpl | 2 |
4 files changed, 23 insertions, 4 deletions
diff --git a/template/en/default/account/profile-activity.html.tmpl b/template/en/default/account/profile-activity.html.tmpl index ee00875fe..aa6a63e85 100644 --- a/template/en/default/account/profile-activity.html.tmpl +++ b/template/en/default/account/profile-activity.html.tmpl @@ -35,7 +35,7 @@ #%] [% title = BLOCK %] - Account History for '[% otheruser.login FILTER html %]' + [% IF action == 'admin_activity' %]Admin[% ELSE %]Account[% END %] History for '[% otheruser.login FILTER html %]' [% END %] diff --git a/template/en/default/admin/users/edit.html.tmpl b/template/en/default/admin/users/edit.html.tmpl index 3efa4b8bf..010cacb73 100644 --- a/template/en/default/admin/users/edit.html.tmpl +++ b/template/en/default/admin/users/edit.html.tmpl @@ -116,9 +116,15 @@ <input type="hidden" name="token" value="[% token FILTER html %]"> [% INCLUDE listselectionhiddenfields %] - or <a href="editusers.cgi?action=activity&userid=[% otheruser.id %]" - title="View Account History for ' - [%- otheruser.login FILTER html %]'">View Account History</a> + [% IF editusers %], [% ELSE %] or [% END %] + <a href="editusers.cgi?action=activity&userid=[% otheruser.id %]" + title="View Account History for ' + [%- otheruser.login FILTER html %]'">View Account History</a> + [% IF editusers %] + or <a href="editusers.cgi?action=admin_activity&userid=[% otheruser.id %]" + title="View Account History for ' + [%- otheruser.login FILTER html %]'">View Admin History</a> + [% END %] </p> </form> <p> diff --git a/template/en/default/admin/users/list.html.tmpl b/template/en/default/admin/users/list.html.tmpl index 3f745a458..4d1d35c95 100644 --- a/template/en/default/admin/users/list.html.tmpl +++ b/template/en/default/admin/users/list.html.tmpl @@ -51,6 +51,17 @@ ] %] +[% IF editusers %] + [% columns.push({ + heading => 'Admin History' + content => 'View' + contentlink => 'editusers.cgi?action=admin_activity' _ + '&userid=%%userid%%' _ + listselectionurlparams + }) + %] +[% END %] + [% IF Param('allowuserdeletion') && editusers %] [% columns.push({heading => 'Action' content => 'Delete' diff --git a/template/en/default/global/user-error.html.tmpl b/template/en/default/global/user-error.html.tmpl index 6a37d07e2..acdb11381 100644 --- a/template/en/default/global/user-error.html.tmpl +++ b/template/en/default/global/user-error.html.tmpl @@ -160,6 +160,8 @@ use [% ELSIF action == "approve" %] approve + [% ELSIF action == "admin_activity" %] + view admin activity for [% ELSE %] [%+ Hook.process('auth_failure_action') %] [% END %] |