pk/atst
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Move pagination macro out of audit log fragment

Browse Source
This commit is contained in:
leigh-mil 2019-01-09 10:53:07 -05:00
parent 8e8adb8c6a
commit 16febc2a77
3 changed files with 22 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
templates/audit_log/audit_log.html
View File

@ -2,5 +2,8 @@
{% from "components/pagination.html" import Pagination %} {% from "components/pagination.html" import Pagination %}
{% block content %} {% block content %}
{% include "fragments/audit_events_log.html" %} <div v-cloak>
{% include "fragments/audit_events_log.html" %}
{{ Pagination(audit_events, 'atst.activity_history')}}
</div>
{% endblock %} {% endblock %}

32
templates/fragments/audit_events_log.html
View File

@ -1,21 +1,17 @@
{% from "components/pagination.html" import Pagination %} {% from "components/pagination.html" import Pagination %}
<div v-cloak> <section class="block-list">
<section class="block-list"> <header class="block-list__header">
<header class="block-list__header"> <h1 class="block-list__title">{{ "audit_log.header_title" | translate }}</h1>
<h1 class="block-list__title">{{ "audit_log.header_title" | translate }}</h1> </header>
</header>
<ul> <ul>
{% for event in audit_events %} {% for event in audit_events %}
<li class="block-list__item"> <li class="block-list__item">
{% autoescape false %} {% autoescape false %}
{{ event | renderAuditEvent }} {{ event | renderAuditEvent }}
{% endautoescape %} {% endautoescape %}
</li> </li>
{% endfor %} {% endfor %}
</ul> </ul>
</section> </section>
{{ Pagination(audit_events, 'workspaces.workspace_activity', workspace_id=workspace_id) }}
</div>

5
templates/workspaces/activity/index.html
View File

@ -2,5 +2,8 @@
{% from "components/pagination.html" import Pagination %} {% from "components/pagination.html" import Pagination %}
{% block workspace_content %} {% block workspace_content %}
{% include "fragments/audit_events_log.html" %} <div v-cloak>
{% include "fragments/audit_events_log.html" %}
{{ Pagination(audit_events, 'workspaces.workspace_activity', workspace_id=workspace_id) }}
</div>
{% endblock %} {% endblock %}