From e86ab03f06328cfffcb6a7c861c83f38a1792944 Mon Sep 17 00:00:00 2001
From: Craig Williams <craig@avsdev.uk>
Date: Tue, 6 Jun 2023 14:42:49 +0100
Subject: [PATCH] Fixed column names

---
 templates/tables/activities.html.twig                     | 2 +-
 templates/tables/columns/activities-occurred_at.html.twig | 2 +-
 templates/tables/columns/groups-description.html.twig     | 2 +-
 templates/tables/columns/permissions-via_roles.html.twig  | 2 +-
 templates/tables/columns/roles-description.html.twig      | 2 +-
 templates/tables/columns/users-last_activity.html.twig    | 2 +-
 templates/tables/columns/users-via_roles.html.twig        | 2 +-
 templates/tables/permissions.html.twig                    | 2 +-
 templates/tables/users.html.twig                          | 4 ++--
 9 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/templates/tables/activities.html.twig b/templates/tables/activities.html.twig
index d020f79..f84be48 100644
--- a/templates/tables/activities.html.twig
+++ b/templates/tables/activities.html.twig
@@ -11,7 +11,7 @@
     <table id="{{table.id}}" class="tablesorter table table-bordered table-hover table-striped" data-sortlist="[[0, 1]]">
         <thead>
             <tr>
-                <th class="sorter-metanum" data-column-name="occurred_at" data-column-template="#{{table.id}}-column-occurred-at" data-priority="1">{{translate('ACTIVITY.TIME')}} <i class="fas fa-sort"></i></th>
+                <th class="sorter-metanum" data-column-name="occurred_at" data-column-template="#{{table.id}}-column-occurredAt" data-priority="1">{{translate('ACTIVITY.TIME')}} <i class="fas fa-sort"></i></th>
                 {% if 'user' in table.columns %}
                     <th class="sorter-metatext" data-column-name="user" data-column-template="#{{table.id}}-column-user" data-priority="1">{{translate('USER')}} <i class="fas fa-sort"></i></th>
                 {% endif %}
diff --git a/templates/tables/columns/activities-occurred_at.html.twig b/templates/tables/columns/activities-occurred_at.html.twig
index fc5af3c..b9ddd34 100644
--- a/templates/tables/columns/activities-occurred_at.html.twig
+++ b/templates/tables/columns/activities-occurred_at.html.twig
@@ -1,4 +1,4 @@
-<script id="{{table.id}}-column-occurred-at" type="text/x-handlebars-template">
+<script id="{{table.id}}-column-occurredAt" type="text/x-handlebars-template">
     {% verbatim %}
     {{#if row.occurred_at }}
     <td data-num="{{dateFormat row.occurred_at format='x'}}">
diff --git a/templates/tables/columns/groups-description.html.twig b/templates/tables/columns/groups-description.html.twig
index 8e5e32f..c463b32 100644
--- a/templates/tables/columns/groups-description.html.twig
+++ b/templates/tables/columns/groups-description.html.twig
@@ -1 +1 @@
-{% include "tables/columns/abstract-description.html.twig" %}
\ No newline at end of file
+{% include "tables/columns/abstract/description.html.twig" %}
\ No newline at end of file
diff --git a/templates/tables/columns/permissions-via_roles.html.twig b/templates/tables/columns/permissions-via_roles.html.twig
index c31662c..05b8a96 100644
--- a/templates/tables/columns/permissions-via_roles.html.twig
+++ b/templates/tables/columns/permissions-via_roles.html.twig
@@ -1,4 +1,4 @@
-<script id="{{table.id}}-column-via-roles" type="text/x-handlebars-template">
+<script id="{{table.id}}-column-viaRoles" type="text/x-handlebars-template">
     {% verbatim %}
     <td>
         {{#each row.roles_via }}
diff --git a/templates/tables/columns/roles-description.html.twig b/templates/tables/columns/roles-description.html.twig
index 8e5e32f..c463b32 100644
--- a/templates/tables/columns/roles-description.html.twig
+++ b/templates/tables/columns/roles-description.html.twig
@@ -1 +1 @@
-{% include "tables/columns/abstract-description.html.twig" %}
\ No newline at end of file
+{% include "tables/columns/abstract/description.html.twig" %}
\ No newline at end of file
diff --git a/templates/tables/columns/users-last_activity.html.twig b/templates/tables/columns/users-last_activity.html.twig
index 81f243e..481681a 100644
--- a/templates/tables/columns/users-last_activity.html.twig
+++ b/templates/tables/columns/users-last_activity.html.twig
@@ -1,4 +1,4 @@
-<script id="{{table.id}}-column-last-activity" type="text/x-handlebars-template">
+<script id="{{table.id}}-column-lastActivity" type="text/x-handlebars-template">
     {% verbatim %}
     {{#if row.last_activity }}
     <td data-num="{{dateFormat row.last_activity.occurred_at format='x'}}">
diff --git a/templates/tables/columns/users-via_roles.html.twig b/templates/tables/columns/users-via_roles.html.twig
index c31662c..05b8a96 100644
--- a/templates/tables/columns/users-via_roles.html.twig
+++ b/templates/tables/columns/users-via_roles.html.twig
@@ -1,4 +1,4 @@
-<script id="{{table.id}}-column-via-roles" type="text/x-handlebars-template">
+<script id="{{table.id}}-column-viaRoles" type="text/x-handlebars-template">
     {% verbatim %}
     <td>
         {{#each row.roles_via }}
diff --git a/templates/tables/permissions.html.twig b/templates/tables/permissions.html.twig
index 069db0b..f40e759 100644
--- a/templates/tables/permissions.html.twig
+++ b/templates/tables/permissions.html.twig
@@ -14,7 +14,7 @@
                 <th class="sorter-metatext" data-column-name="name" data-column-template="#{{table.id}}-column-name" data-priority="1">{{translate('PERMISSION')}} <i class="fas fa-sort"></i></th>
                 <th class="sorter-metatext" data-column-name="properties" data-column-template="#{{table.id}}-column-properties" data-priority="1">{{translate('SLUG_CONDITION')}} <i class="fas fa-sort"></i></th>
                 {% if 'via_roles' in table.columns %}
-                    <th data-column-template="#{{table.id}}-column-via-roles" data-sorter="false" data-filter="false" data-priority="2">{{translate('PERMISSION.VIA_ROLES')}}</th>
+                    <th data-column-template="#{{table.id}}-column-viaRoles" data-sorter="false" data-filter="false" data-priority="2">{{translate('PERMISSION.VIA_ROLES')}}</th>
                 {% endif %}
             </tr>
         </thead>
diff --git a/templates/tables/users.html.twig b/templates/tables/users.html.twig
index 52af303..311190a 100644
--- a/templates/tables/users.html.twig
+++ b/templates/tables/users.html.twig
@@ -13,10 +13,10 @@
             <tr>
                 <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>
                 {% if 'last_activity' in table.columns %}
-                    <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>
+                    <th class="sorter-metanum" data-column-name="last_activity" data-column-template="#{{table.id}}-column-lastActivity" data-priority="3">{{translate("ACTIVITY.LAST")}} <i class="fas fa-sort"></i></th>
                 {% endif %}
                 {% if 'via_roles' in table.columns %}
-                    <th data-column-template="#{{table.id}}-column-via-roles" data-sorter="false" data-filter="false" data-priority="1">{{translate('PERMISSION.VIA_ROLES')}}</th>
+                    <th data-column-template="#{{table.id}}-column-viaRoles" 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="#{{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>