Merge branch 'admin-auditing'

4 files changed, 82 insertions, 6 deletions

diff --git a/templates/web/base/admin/users/form.html b/templates/web/base/admin/users/form.html
index f141dc02c..495da8648 100644
--- a/templates/web/base/admin/users/form.html
+++ b/templates/web/base/admin/users/form.html
@@ -1,4 +1,7 @@
-<form method="post" id="user_edit" action="[% c.uri_for_action( 'admin/users/edit', user.id || 'add' ) %]" enctype="application/x-www-form-urlencoded" accept-charset="utf-8">
+<form method="post" id="user_edit" action="[%
+    SET action_end = user.id || 'add';
+    c.uri_for_action( 'admin/users/edit', [ action_end ] )
+    %]" enctype="application/x-www-form-urlencoded" accept-charset="utf-8">
     <input type="hidden" name="token" value="[% csrf_token %]" >
     <input type="hidden" name="submit" value="1" >
 
diff --git a/templates/web/base/admin/users/import.html b/templates/web/base/admin/users/import.html
index 6e11c74a9..38e4fe240 100644
--- a/templates/web/base/admin/users/import.html
+++ b/templates/web/base/admin/users/import.html
@@ -27,7 +27,7 @@
         [% FOREACH user IN new_users %]
             <tr>
                 <td>
-                    <a href="[% c.uri_for_action( 'admin/users/edit', user.id ) %]">
+                    <a href="[% c.uri_for_action( 'admin/users/edit', [ user.id ] ) %]">
                         [% user.name %]
                     </a>
                 </td>
@@ -50,7 +50,7 @@
         [% FOREACH user IN existing_users %]
             <tr>
                 <td>
-                    <a href="[% c.uri_for_action( 'admin/users/edit', user.id ) %]">
+                    <a href="[% c.uri_for_action( 'admin/users/edit', [ user.id ] ) %]">
                         [% user.name %]
                     </a>
                 </td>
diff --git a/templates/web/base/admin/users/index.html b/templates/web/base/admin/users/index.html
index f48893cb0..e573c10fe 100644
--- a/templates/web/base/admin/users/index.html
+++ b/templates/web/base/admin/users/index.html
@@ -46,7 +46,7 @@
       [% IF c.cobrand.moniker != 'zurich' %]
         <th>[% loc('Flagged') %]</th>
       [% END %]
-        <th>*</th>
+        <th colspan="2">*</th>
     </tr>
 [%- FOREACH user IN users %]
     <tr>
@@ -57,14 +57,15 @@
             [% PROCESS value_or_nbsp value=user.name %]
             [% IF user.from_body %]</label>[% END %]
         </td>
-        <td><a href="[% c.uri_for_action( 'admin/reports', search => user.email ) %]">[% PROCESS value_or_nbsp value=user.email %]</a></td> 
+        <td><a href="[% c.uri_for_action( 'admin/reports/index', search => user.email ) %]">[% PROCESS value_or_nbsp value=user.email %]</a></td>
         <td>[% PROCESS value_or_nbsp value=user.from_body.name %]
             [% IF user.is_superuser %] * [% END %]
         </td>
       [% IF c.cobrand.moniker != 'zurich' %]
         <td>[% user.flagged == 2 ? loc('User in abuse table') : user.flagged ? loc('Yes') : '&nbsp;' %]</td>
       [% END %]
-        <td>[% IF user.id %]<a href="[% c.uri_for_action( 'admin/users/edit', user.id ) %]">[% loc('Edit') %]</a>[% END %]</td>
+        <td>[% IF user.id %]<a href="[% c.uri_for_action( 'admin/users/edit', [ user.id ] ) %]">[% loc('Edit') %]</a>[% END %]</td>
+        <td>[% IF user.id %]<a href="[% c.uri_for_action( 'admin/users/log', [ user.id ] ) %]">[% loc('Timeline') %]</a>[% END %]</td>
     </tr>
 [%- END -%]
 </table>
diff --git a/templates/web/base/admin/users/log.html b/templates/web/base/admin/users/log.html
new file mode 100644
index 000000000..a596d040c
--- /dev/null
+++ b/templates/web/base/admin/users/log.html
@@ -0,0 +1,72 @@
+[% INCLUDE 'admin/header.html' title=loc('Timeline') _ ', ' _ user.name %]
+
+<style>
+.timeline ul {
+    margin-bottom: 0;
+}
+.timeline dd {
+    margin-bottom: 0;
+}
+</style>
+
+[%
+action_map = {
+    add = 'Added'
+    delete = 'Deleted'
+    edit = 'Edited'
+    merge = 'Merged'
+    moderation = 'Moderated'
+    resend = 'Resent'
+    category_change = 'Changed category of'
+    state_change = 'Changed state of'
+}
+%]
+
+[%- date = '' %]
+[% FOREACH moment IN time.keys.sort.reverse %]
+    [%- curdate = time.$moment.0.date.strftime('%A, %e %B %Y') -%]
+    [%- IF date != curdate %]
+        [% '</dl>' IF date %]
+        <h2>[% curdate %]</h2>
+
+        <dl class="timeline">
+        [%- date = curdate -%]
+    [%- END -%]
+    <dt><b>[% time.$moment.0.date.hms %]</b></dt>
+    <dd><ul>
+    [% FOREACH item IN time.$moment %]
+        <li>
+        [%~ IF item.obj.problem_id %]
+            [%~ SET report_url = c.uri_for( '/report', item.obj.problem_id ) _ "#update_" _ item.obj.id %]
+        [%~ ELSE %]
+            [%~ SET report_url = c.uri_for('/report', item.obj.id) %]
+        [%~ END %]
+        [%~ SET report_link = "<a href='" _ report_url _ "'>" _ item.obj.id _ "</a>" %]
+        [%- SWITCH item.type -%]
+            [%~ CASE 'problem' %]
+                [%- tprintf(loc('Problem %s created'), report_link) %], ‘[% item.obj.title | html %]’
+            [%~ CASE 'problemContributedBy' %]
+                [%- tprintf(loc('Problem %s created on behalf of %s'), report_link, item.obj.name) %], ‘[% item.obj.title | html %]’
+            [%~ CASE 'update' %]
+                [% tprintf(loc("Update %s created for problem %d"), report_link, item.obj.problem_id) %]
+                [% item.obj.text | add_links | markup(item.obj.user) | html_para %]
+            [%~ CASE 'shortlistAdded' %]
+                [%- tprintf(loc('Problem %s added to shortlist'), report_link) %]
+            [%~ CASE 'shortlistRemoved' %]
+                [%- tprintf(loc('Problem %s removed from shortlist'), report_link) %]
+            [%~ CASE 'log' %]
+                [%~ SET object_summary = item.log.object_summary %]
+              [% IF object_summary %]
+                [%~ SET link = tprintf('<a href="%s">%s</a>', item.log.link, object_summary) %]
+                [%- tprintf('%s %s %s', action_map.${item.log.action}, item.log.actual_object_type, link) %]
+                [% ' – ' _ item.log.reason IF item.log.reason %]
+              [% ELSE %]
+                [%- tprintf('%s %s %s', action_map.${item.log.action}, item.log.actual_object_type, item.log.object_id) %]
+              [% END %]
+        [%- END %]
+        </li>
+    [%- END %]
+    </ul></dd>
+[% END %]
+
+[% INCLUDE 'admin/footer.html' %]