user-audit: share same template for rendering audit logs between user and admin views.

rhodecode/templates/admin/admin_log_base.mako

@@ -0,0 +1,60 b''
+<%namespace name="base" file="/base/base.mako"/>
+
+%if c.audit_logs:
+<table class="rctable admin_log">
+    <tr>
+        <th>${_('Username')}</th>
+        <th>${_('Action')}</th>
+        <th>${_('Action Data')}</th>
+        <th>${_('Repository')}</th>
+        <th>${_('Date')}</th>
+        <th>${_('IP')}</th>
+    </tr>
+
+    %for cnt,l in enumerate(c.audit_logs):
+    <tr class="parity${cnt%2}">
+        <td class="td-user">
+            %if l.user is not None:
+              ${base.gravatar_with_user(l.user.email)}
+            %else:
+              ${l.username}
+            %endif
+        </td>
+        <td class="td-journalaction">
+            % if l.version == l.VERSION_1:
+                ${h.action_parser(l)[0]()}
+            % else:
+                ${h.literal(l.action)}
+            % endif
+
+            <div class="journal_action_params">
+                % if l.version == l.VERSION_1:
+                    ${h.literal(h.action_parser(l)[1]())}
+                % endif
+            </div>
+        </td>
+        <td>
+            % if l.version == l.VERSION_2:
+                ${l.action_data}
+            % endif
+        </td>
+        <td class="td-componentname">
+            %if l.repository is not None:
+              ${h.link_to(l.repository.repo_name,h.url('summary_home',repo_name=l.repository.repo_name))}
+            %else:
+              ${l.repository_name}
+            %endif
+        </td>
+
+        <td class="td-time">${h.format_date(l.action_date)}</td>
+        <td class="td-ip">${l.user_ip}</td>
+    </tr>
+    %endfor
+</table>
+
+<div class="pagination-wh pagination-left">
+${c.audit_logs.pager('$link_previous ~2~ $link_next')}
+</div>
+%else:
+    ${_('No actions yet')}
+%endif
  No newline at end of file

rhodecode/apps/admin/views/users.py

@@ -293,14 +293,14 b' class AdminUsersView(BaseAppView, DataGr'
         p = safe_int(self.request.GET.get('page', 1), 1)
 
         filter_term = self.request.GET.get('filter')
-        c.user_log = UserModel().get_user_log(c.user, filter_term)
+        user_log = UserModel().get_user_log(c.user, filter_term)
 
         def url_generator(**kw):
             if filter_term:
                 kw['filter'] = filter_term
             return self.request.current_route_path(_query=kw)
 
-        c.user_log = Page(c.user_log, page=p, items_per_page=10,
+        c.audit_logs = Page(user_log, page=p, items_per_page=10,
                           url=url_generator)
         c.filter_term = filter_term
         return self._get_template_context(c)

rhodecode/controllers/admin/admin.py

@@ -67,7 +67,7 b' class AdminController(BaseController):'
         def url_generator(**kw):
             return url.current(filter=c.search_term, **kw)
 
-        c.users_log = Page(users_log, page=p, items_per_page=10,
+        c.audit_logs = Page(users_log, page=p, items_per_page=10,
                            url=url_generator)
         c.log_data = render('admin/admin_log.mako')
 

rhodecode/templates/admin/admin.mako

@@ -12,7 +12,7 b''
     ${h.form(None, id_="filter_form", method="get")}
         <input class="q_filter_box ${'' if c.search_term else 'initial'}" id="j_filter" size="15" type="text" name="filter" value="${c.search_term or ''}" placeholder="${_('journal filter...')}"/>
         <input type='submit' value="${_('filter')}" class="btn" />
-        ${_('Admin journal')} - ${ungettext('%s entry', '%s entries', c.users_log.item_count) % (c.users_log.item_count)}
+        ${_('Admin journal')} - ${ungettext('%s entry', '%s entries', c.audit_logs.item_count) % (c.audit_logs.item_count)}
     ${h.end_form()}
     <p class="tooltip filterexample" title="${h.tooltip(h.journal_filter_help())}">${_('Example Queries')}</p>
 </%def>

rhodecode/templates/admin/admin_log.mako

@@ -1,64 +1,5 b''
 ## -*- coding: utf-8 -*-
-<%namespace name="base" file="/base/base.mako"/>
-
-%if c.users_log:
-<table class="rctable admin_log">
-    <tr>
-        <th>${_('Username')}</th>
-        <th>${_('Action')}</th>
-        <th>${_('Action Data')}</th>
-        <th>${_('Repository')}</th>
-        <th>${_('Date')}</th>
-        <th>${_('IP')}</th>
-    </tr>
-
-    %for cnt,l in enumerate(c.users_log):
-    <tr class="parity${cnt%2}">
-        <td class="td-user">
-            %if l.user is not None:
-              ${base.gravatar_with_user(l.user.email)}
-            %else:
-              ${l.username}
-            %endif
-        </td>
-        <td class="td-journalaction">
-            % if l.version == l.VERSION_1:
-                ${h.action_parser(l)[0]()}
-            % else:
-                ${h.literal(l.action)}
-            % endif
-
-            <div class="journal_action_params">
-                % if l.version == l.VERSION_1:
-                    ${h.literal(h.action_parser(l)[1]())}
-                % endif
-            </div>
-        </td>
-        <td>
-            % if l.version == l.VERSION_2:
-                ${l.action_data}
-            % endif
-        </td>
-        <td class="td-componentname">
-            %if l.repository is not None:
-              ${h.link_to(l.repository.repo_name,h.url('summary_home',repo_name=l.repository.repo_name))}
-            %else:
-              ${l.repository_name}
-            %endif
-        </td>
-
-        <td class="td-time">${h.format_date(l.action_date)}</td>
-        <td class="td-ip">${l.user_ip}</td>
-    </tr>
-    %endfor
-</table>
-
-<div class="pagination-wh pagination-left">
-${c.users_log.pager('$link_previous ~2~ $link_next')}
-</div>
-%else:
-    ${_('No actions yet')}
-%endif
+<%include file="/admin/admin_log_base.mako" />
 
 <script type="text/javascript">
     $(function(){

rhodecode/templates/admin/users/user_edit_audit.mako

@@ -5,7 +5,7 b''
 <div class="panel panel-default">
     <div class="panel-heading">
       <h3 class="panel-title">${_('User Audit Logs')} -
-      ${_ungettext('%s entry', '%s entries', c.user_log.item_count) % (c.user_log.item_count)}
+      ${_ungettext('%s entry', '%s entries', c.audit_logs.item_count) % (c.audit_logs.item_count)}
       </h3>
     </div>
     <div class="panel-body">
@@ -16,50 +16,7 b''
         ${h.end_form()}
         <p class="tooltip filterexample" style="position: inherit" title="${h.tooltip(h.journal_filter_help())}">${_('Example Queries')}</p>
 
-        % if c.user_log:
-            <table class="rctable admin_log">
-                <tr>
-                    <th>${_('Username')}</th>
-                    <th>${_('Action')}</th>
-                    <th>${_('Repository')}</th>
-                    <th>${_('Date')}</th>
-                    <th>${_('From IP')}</th>
-                </tr>
-
-                %for cnt,l in enumerate(c.user_log):
-                <tr class="parity${cnt%2}">
-                    <td class="td-user">
-                        %if l.user is not None:
-                          ${base.gravatar_with_user(l.user.email)}
-                        %else:
-                          ${l.username}
-                        %endif
-                    </td>
-                    <td class="td-journalaction">${h.action_parser(l)[0]()}
-                        <div class="journal_action_params">
-                            ${h.literal(h.action_parser(l)[1]())}
-                        </div>
-                    </td>
-                    <td class="td-componentname">
-                        %if l.repository is not None:
-                          ${h.link_to(l.repository.repo_name,h.url('summary_home',repo_name=l.repository.repo_name))}
-                        %else:
-                          ${l.repository_name}
-                        %endif
-                    </td>
-
-                    <td class="td-time">${h.format_date(l.action_date)}</td>
-                    <td class="td-ip">${l.user_ip}</td>
-                </tr>
-                %endfor
-            </table>
-
-            <div class="pagination-wh pagination-left">
-            ${c.user_log.pager('$link_previous ~2~ $link_next')}
-            </div>
-        % else:
-            ${_('No actions yet')}
-        % endif
+        <%include file="/admin/admin_log_base.mako" />
 
     </div>
 </div>