1048336 Sortieren in Permission Tabellen nicht möglich - fixed, sorting is now working

entity/PermissionMetaData_entity/PermissionMetaData_entity.aod

@@ -92,6 +92,7 @@
       <jDitoRecordAlias>_____SYSTEMALIAS</jDitoRecordAlias>
       <isPageable v="false" />
       <isFilterable v="true" />
+      <isSortable v="true" />
       <contentProcess>%aditoprj%/entity/PermissionMetaData_entity/recordcontainers/jdito/contentProcess.js</contentProcess>
       <recordFieldMappings>
         <jDitoRecordFieldMapping>

entity/PermissionMetaData_entity/recordcontainers/jdito/contentProcess.js

+import("Util_lib");
 import("system.vars");
 import("system.result");
 import("system.project");
@@ -17,4 +18,23 @@ if (selectedEntity == null) {
     res.push([entity[0], entity[1], entity[2], entity[6]]);
 }
 
-result.object(res.sort());
\ No newline at end of file
+var order = vars.get("$local.order");
+var columnOrder = {
+    "UID.value" : 1,
+    "TITLE.value" : 2
+};
+var sortOrder = [];
+for (let field in order)
+{
+    if (field in columnOrder)
+    {
+        sortOrder.push(columnOrder[field]);
+        sortOrder.push(order[field] == "DOWN");
+    }
+}
+if (!sortOrder.length) //sort by entity name by default
+    sortOrder = [1, false];
+
+ArrayUtils.sortMulti(res, sortOrder);
+
+result.object(res);
\ No newline at end of file

entity/PermissionOverview_entity/PermissionOverview_entity.aod

@@ -86,6 +86,7 @@
       <name>jDito</name>
       <jDitoRecordAlias>_____SYSTEMALIAS</jDitoRecordAlias>
       <isFilterable v="false" />
+      <isSortable v="true" />
       <contentProcess>%aditoprj%/entity/PermissionOverview_entity/recordcontainers/jdito/contentProcess.js</contentProcess>
       <recordFieldMappings>
         <jDitoRecordFieldMapping>

entity/PermissionOverview_entity/recordcontainers/jdito/contentProcess.js

-import("system.logging");
+import("Util_lib");
 import("Sql_lib");
 import("system.project");
 import("system.vars");
@@ -91,6 +91,30 @@ for each (var entry in rolesOrEntities) { // entry contains either a role or an
         res.push(currOverview);
     }
 }
+
+var order = vars.get("$local.order");
+var columnOrder = {
+    "ENTITY.value" : 1,
+    "ACTION_VIEW.value" : 2,
+    "ACTION_CREATE.value" : 3,
+    "ACTION_READ.value" : 4,
+    "ACTION_UPDATE.value" : 5,
+    "ACTION_DELETE.value" : 6
+};
+var sortOrder = [];
+for (let field in order)
+{
+    if (field in columnOrder)
+    {
+        sortOrder.push(columnOrder[field]);
+        sortOrder.push(order[field] == "DOWN");
+    }
+}
+if (!sortOrder.length) //sort by entity or role by default
+    sortOrder = [1, false];
+
+ArrayUtils.sortMulti(res, sortOrder);
+
 result.object(res);
 
 function prepareOverview(pPermSetId, pCurrOverview, pMode) {

entity/Role_entity/Role_entity.aod

@@ -176,6 +176,7 @@
       <name>jDito</name>
       <jDitoRecordAlias>_____SYSTEMALIAS</jDitoRecordAlias>
       <isFilterable v="true" />
+      <isSortable v="true" />
       <contentProcess>%aditoprj%/entity/Role_entity/recordcontainers/jdito/contentProcess.js</contentProcess>
       <onInsert>%aditoprj%/entity/Role_entity/recordcontainers/jdito/onInsert.js</onInsert>
       <onUpdate>%aditoprj%/entity/Role_entity/recordcontainers/jdito/onUpdate.js</onUpdate>

entity/Role_entity/recordcontainers/jdito/contentProcess.js

+import("Util_lib");
 import("system.translate");
 import("system.vars");
 import("system.result");
@@ -38,4 +39,25 @@ if (selectedRole != null) {
     });
 }
 
-result.object(res.sort());
\ No newline at end of file
+var order = vars.get("$local.order");
+var columnOrder = {
+    "ROLENAME.value" : 1,
+    "ROLETITLE.value" : 2,
+    "ROLETYPE.value" : 3,
+    "USERCOUNT.value" : 5
+};
+var sortOrder = [];
+for (let field in order)
+{
+    if (field in columnOrder)
+    {
+        sortOrder.push(columnOrder[field]);
+        sortOrder.push(order[field] == "DOWN");
+    }
+}
+if (!sortOrder.length) //sort by role name by default
+    sortOrder = [1, false];
+
+ArrayUtils.sortMulti(res, sortOrder);
+
+result.object(res);
\ No newline at end of file