AVSDev/sprinkle-organisations
1
0
Fork 0
Code Issues 2 Pull Requests Projects Releases Wiki Activity

Removed table specific id string part and replaced it with the provided {{table.id}}

Browse Source
This commit is contained in:
Craig Williams
2022-02-22 15:29:11 +00:00
parent f75bde0ccf
commit 3490f7c6f1
3 changed files with 70 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
templates/tables/users.html.twig
View File

@@ -4,16 +4,16 @@
<table id="{{table.id}}" class="tablesorter table table-bordered table-hover table-striped" data-sortlist="{{table.sortlist}}">
<thead>
<tr>
<th class="sorter-metatext" data-column-name="name" data-column-template="#user-table-column-info" data-priority="1">{{translate('USER')}} <i class="fas fa-sort"></i></th>
<th class="filter-metatext" data-column-name="organisations" data-column-template="#user-table-column-organisations" data-priority="2">{{translate("ORGANISATION", 2)}}</th>
<th class="sorter-metatext" data-column-name="name" data-column-template="#{{table.id}}-column-info" data-priority="1">{{translate('USER')}} <i class="fas fa-sort"></i></th>
<th class="filter-metatext" data-column-name="organisations" data-column-template="#{{table.id}}-column-organisations" data-priority="2">{{translate("ORGANISATION", 2)}}</th>
{% if 'last_activity' in table.columns %}
<th class="sorter-metanum" data-column-name="last_activity" data-column-template="#user-table-column-last-activity" data-priority="3">{{translate("ACTIVITY.LAST")}} <i class="fas fa-sort"></i></th>
<th class="sorter-metanum" data-column-name="last_activity" data-column-template="#{{table.id}}-column-last-activity" data-priority="3">{{translate("ACTIVITY.LAST")}} <i class="fas fa-sort"></i></th>
{% endif %}
{% if 'via_roles' in table.columns %}
<th data-column-template="#user-table-column-via-roles" data-sorter="false" data-filter="false" data-priority="1">{{translate('PERMISSION.VIA_ROLES')}}</th>
<th data-column-template="#{{table.id}}-column-via-roles" data-sorter="false" data-filter="false" data-priority="1">{{translate('PERMISSION.VIA_ROLES')}}</th>
{% endif %}
<th class="filter-select filter-metatext" data-column-name="status" data-column-template="#user-table-column-status" data-priority="2">{{translate("STATUS")}} <i class="fas fa-sort"></i></th>
<th data-column-name="actions" data-column-template="#user-table-column-actions" data-sorter="false" data-filter="false" data-priority="1">{{translate("ACTIONS")}}</th>
<th class="filter-select filter-metatext" data-column-name="status" data-column-template="#{{table.id}}-column-status" data-priority="2">{{translate("STATUS")}} <i class="fas fa-sort"></i></th>
<th data-column-name="actions" data-column-template="#{{table.id}}-column-actions" data-sorter="false" data-filter="false" data-priority="1">{{translate("ACTIONS")}}</th>
</tr>
</thead>
<tbody>
@@ -23,8 +23,8 @@
{% block table_cell_template_actions %}
{% verbatim %}
<script id="user-table-column-actions" type="text/x-handlebars-template">
<script id="{{table.id}}-column-actions" type="text/x-handlebars-template">
{%- verbatim %}
<td class="uf-table-fit-width">
<div class="btn-group">
<button type="button" class="btn btn-primary dropdown-toggle" data-toggle="dropdown">{% endverbatim %}{{translate("ACTIONS")}}{% verbatim %}<span class="caret"></span></button>
@@ -75,14 +75,14 @@
</ul>
</div>
</td>
{% endverbatim -%}
</script>
{% endverbatim %}
{% endblock %}
{% block table_cell_template_extra %}
{% block table_cell_template_organisations %}
{% verbatim %}
<script id="user-table-column-organisations" type="text/x-handlebars-template">
<script id="{{table.id}}-column-organisations" type="text/x-handlebars-template">
{%- verbatim %}
<td style="line-height: 2em;">
{{#if row.organisations.length }}
{{#each row.organisations }}
@@ -95,8 +95,8 @@
{{/each}}
{{/if }}
</td>
{% endverbatim -%}
</script>
{% endverbatim %}
{% endblock %}
{% endblock %}