fix

eja · Sep 26, 2024 · eedb2cb · eedb2cb
1 parent f2ac795
commit eedb2cb
Show file tree

Hide file tree

Showing 2 changed files with 73 additions and 27 deletions.
diff --git a/db/assets/ejaModules.json b/db/assets/ejaModules.json
@@ -1,23 +1,22 @@
 {
-  "type": "module",
   "module": {
-    "sqlCreated": 1,
-    "sortList": "name",
     "parentName": "ejaStructure",
     "power": 1,
-    "searchLimit": 0
+    "searchLimit": 0,
+    "sqlCreated": 1,
+    "sortList": "name"
   },
   "command": [
     "logout",
     "new",
     "edit",
     "previous",
     "next",
-    "search",
-    "save",
     "copy",
-    "list",
     "delete",
+    "save",
+    "search",
+    "list",
     "link",
     "unlink"
   ],
@@ -29,7 +28,10 @@
       "type": "sqlMatrix",
       "translate": 0,
       "powerSearch": 2,
-      "name": "parentId"
+      "name": "parentId",
+      "sizeSearch": 0,
+      "sizeList": 0,
+      "sizeEdit": 0
     },
     {
       "value": "",
@@ -38,7 +40,10 @@
       "type": "text",
       "translate": 0,
       "powerSearch": 1,
-      "name": "name"
+      "name": "name",
+      "sizeSearch": 0,
+      "sizeList": 0,
+      "sizeEdit": 0
     },
     {
       "value": "",
@@ -47,7 +52,10 @@
       "type": "integer",
       "translate": 0,
       "powerSearch": 0,
-      "name": "power"
+      "name": "power",
+      "sizeSearch": 0,
+      "sizeList": 0,
+      "sizeEdit": 0
     },
     {
       "value": "",
@@ -56,7 +64,10 @@
       "type": "boolean",
       "translate": 0,
       "powerSearch": 0,
-      "name": "sqlCreated"
+      "name": "sqlCreated",
+      "sizeSearch": 0,
+      "sizeList": 0,
+      "sizeEdit": 0
     },
     {
       "value": "",
@@ -65,7 +76,10 @@
       "type": "integer",
       "translate": 0,
       "powerSearch": 0,
-      "name": "searchLimit"
+      "name": "searchLimit",
+      "sizeSearch": 0,
+      "sizeList": 0,
+      "sizeEdit": 0
     },
     {
       "value": "SELECT name AS value, name AS title FROM ejaFields WHERE ejaModuleId=(SELECT value FROM ejaSession WHERE ejaSession.name='ejaId') ORDER BY name",
@@ -74,7 +88,17 @@
       "type": "sqlMatrix",
       "translate": 0,
       "powerSearch": 0,
-      "name": "sortList"
+      "name": "sortList",
+      "sizeSearch": 0,
+      "sizeList": 0,
+      "sizeEdit": 0
+    }
+  ],
+  "link": [
+    {
+      "srcModule": "ejaModules",
+      "dstModule": "ejaGroups",
+      "power": 1
     }
   ],
   "translation": [
@@ -119,12 +143,13 @@
       "word": "sortList",
       "translation": "Default Sorting"
     },
-		{
+    {
       "ejaLanguage": "en",
       "ejaModuleName": "ejaModules",
       "word": "ejaSqlTableCreated",
       "translation": "Sql table created"
     }
   ],
-  "name": "ejaModules"
+  "name": "ejaModules",
+  "type": "module"
 }
diff --git a/db/assets/ejaPermissions.json b/db/assets/ejaPermissions.json
@@ -1,25 +1,24 @@
 {
-  "type": "module",
   "module": {
-    "sqlCreated": 1,
-    "sortList": "ejaModuleId",
     "parentName": "ejaStructure",
     "power": 4,
-    "searchLimit": 0
+    "searchLimit": 0,
+    "sqlCreated": 1,
+    "sortList": "ejaModuleId"
   },
   "command": [
     "logout",
     "new",
     "edit",
     "previous",
     "next",
-    "search",
-    "save",
     "copy",
-    "list",
     "delete",
+    "save",
+    "search",
+    "list",
     "link",
-		"unlink"
+    "unlink"
   ],
   "field": [
     {
@@ -29,7 +28,10 @@
       "type": "sqlMatrix",
       "translate": 0,
       "powerSearch": 2,
-      "name": "ejaModuleId"
+      "name": "ejaModuleId",
+      "sizeSearch": 0,
+      "sizeList": 0,
+      "sizeEdit": 0
     },
     {
       "value": "SELECT ejaId,name FROM ejaCommands ORDER BY name;",
@@ -38,7 +40,10 @@
       "type": "sqlMatrix",
       "translate": 0,
       "powerSearch": 3,
-      "name": "ejaCommandId"
+      "name": "ejaCommandId",
+      "sizeSearch": 0,
+      "sizeList": 0,
+      "sizeEdit": 0
     },
     {
       "value": "SELECT ejaId,username FROM ejaUsers WHERE ejaId IN (SELECT value FROM ejaSession WHERE ejaSession.name='ejaOwners') ORDER BY username;",
@@ -47,7 +52,22 @@
       "type": "sqlMatrix",
       "translate": 0,
       "powerSearch": 0,
-      "name": "ejaOwner"
+      "name": "ejaOwner",
+      "sizeSearch": 0,
+      "sizeList": 0,
+      "sizeEdit": 0
+    }
+  ],
+  "link": [
+    {
+      "srcModule": "ejaPermissions",
+      "dstModule": "ejaGroups",
+      "power": 2
+    },
+    {
+      "srcModule": "ejaPermissions",
+      "dstModule": "ejaUsers",
+      "power": 2
     }
   ],
   "translation": [
@@ -75,5 +95,6 @@
       "translation": "Command"
     }
   ],
-  "name": "ejaPermissions"
+  "name": "ejaPermissions",
+  "type": "module"
 }