From 721aa3fdefbdf9e830374558664975e02720d108 Mon Sep 17 00:00:00 2001
From: yumoqing <yumoqing@gmail.com>
Date: Wed, 6 Nov 2024 12:00:58 +0800
Subject: [PATCH] bugfix

---
 json/organization.json   |  4 ++--
 json/orgtypes.json       |  6 +++---
 json/permission.json     | 17 +++++++++++++++++
 json/role.json           | 18 ++++++++++++++++++
 json/rolepermission.json | 17 +++++++++++++++++
 json/userapp.json        | 17 +++++++++++++++++
 json/userdepartment.json | 17 +++++++++++++++++
 json/userroles.json      | 18 ++++++++++++++++++
 json/users.json          | 18 ++++++++++++++++++
 9 files changed, 127 insertions(+), 5 deletions(-)
 create mode 100644 json/permission.json
 create mode 100644 json/role.json
 create mode 100644 json/rolepermission.json
 create mode 100644 json/userapp.json
 create mode 100644 json/userdepartment.json
 create mode 100644 json/userroles.json
 create mode 100644 json/users.json

diff --git a/json/organization.json b/json/organization.json
index dda90e6..6e6f649 100644
--- a/json/organization.json
+++ b/json/organization.json
@@ -23,8 +23,8 @@
 			{
 				"field":"orgid",
 				"title":"Users",
-				"url":"../user",
-				"subtable":"user"
+				"url":"../users",
+				"subtable":"users"
 			}
 		],
         "record_toolbar": null
diff --git a/json/orgtypes.json b/json/orgtypes.json
index 7abdad5..e6778da 100644
--- a/json/orgtypes.json
+++ b/json/orgtypes.json
@@ -5,13 +5,13 @@
     "tblname": "orgtypes",
 	"title":"Org. type",
     "params": {
-		"sortby":"orgname",
         "browserfields": {
-            "exclouded": ["id"],
+            "exclouded": ["id", "orgid"],
             "cwidth": {}
         },
         "editexclouded": [
-            "id"
+            "id",
+			"orgid"
         ],
         "record_toolbar": null
     }
diff --git a/json/permission.json b/json/permission.json
new file mode 100644
index 0000000..9f0963a
--- /dev/null
+++ b/json/permission.json
@@ -0,0 +1,17 @@
+{
+    "models_dir": "${HOME}$/py/rbac/models",
+    "output_dir": "${HOME}$/py/sage/wwwroot/_a/permission",
+    "dbname": "sage",
+    "tblname": "permission",
+	"title":"权限",
+    "params": {
+        "browserfields": {
+            "exclouded": ["id"],
+            "cwidth": {}
+        },
+        "editexclouded": [
+            "id"
+        ],
+        "record_toolbar": null
+    }
+}
diff --git a/json/role.json b/json/role.json
new file mode 100644
index 0000000..5a84d69
--- /dev/null
+++ b/json/role.json
@@ -0,0 +1,18 @@
+{
+    "models_dir": "${HOME}$/py/rbac/models",
+    "output_dir": "${HOME}$/py/sage/wwwroot/_a/role",
+    "dbname": "sage",
+    "tblname": "role",
+	"title":"角色",
+    "params": {
+		"sortby":"name",
+        "browserfields": {
+            "exclouded": ["id"],
+            "cwidth": {}
+        },
+        "editexclouded": [
+            "id"
+        ],
+        "record_toolbar": null
+    }
+}
diff --git a/json/rolepermission.json b/json/rolepermission.json
new file mode 100644
index 0000000..bf0912a
--- /dev/null
+++ b/json/rolepermission.json
@@ -0,0 +1,17 @@
+{
+    "models_dir": "${HOME}$/py/rbac/models",
+    "output_dir": "${HOME}$/py/sage/wwwroot/_a/rolepermission",
+    "dbname": "sage",
+    "tblname": "rolepermission",
+	"title":"用户",
+    "params": {
+        "browserfields": {
+            "exclouded": ["id", "roleid"],
+            "cwidth": {}
+        },
+        "editexclouded": [
+            "id", "roleid"
+        ],
+        "record_toolbar": null
+    }
+}
diff --git a/json/userapp.json b/json/userapp.json
new file mode 100644
index 0000000..82d65f6
--- /dev/null
+++ b/json/userapp.json
@@ -0,0 +1,17 @@
+{
+    "models_dir": "${HOME}$/py/rbac/models",
+    "output_dir": "${HOME}$/py/sage/wwwroot/_a/userapp",
+    "dbname": "sage",
+    "tblname": "userapp",
+	"title":"用户",
+    "params": {
+        "browserfields": {
+            "exclouded": ["id", "userid"],
+            "cwidth": {}
+        },
+        "editexclouded": [
+            "id", "userid"
+        ],
+        "record_toolbar": null
+    }
+}
diff --git a/json/userdepartment.json b/json/userdepartment.json
new file mode 100644
index 0000000..91f409e
--- /dev/null
+++ b/json/userdepartment.json
@@ -0,0 +1,17 @@
+{
+    "models_dir": "${HOME}$/py/rbac/models",
+    "output_dir": "${HOME}$/py/sage/wwwroot/_a/userdepartment",
+    "dbname": "sage",
+    "tblname": "userdepartment",
+	"title":"用户",
+    "params": {
+        "browserfields": {
+            "exclouded": ["id", "userid"],
+            "cwidth": {}
+        },
+        "editexclouded": [
+            "id", "userid"
+        ],
+        "record_toolbar": null
+    }
+}
diff --git a/json/userroles.json b/json/userroles.json
new file mode 100644
index 0000000..b2490d9
--- /dev/null
+++ b/json/userroles.json
@@ -0,0 +1,18 @@
+{
+    "models_dir": "${HOME}$/py/rbac/models",
+    "output_dir": "${HOME}$/py/sage/wwwroot/_a/userroles",
+    "dbname": "sage",
+    "tblname": "userroles",
+	"title":"用户",
+    "params": {
+        "browserfields": {
+            "exclouded": ["id", "userid"],
+            "cwidth": {}
+        },
+        "editexclouded": [
+            "id",
+			"userid"
+        ],
+        "record_toolbar": null
+    }
+}
diff --git a/json/users.json b/json/users.json
new file mode 100644
index 0000000..35c9cc9
--- /dev/null
+++ b/json/users.json
@@ -0,0 +1,18 @@
+{
+    "models_dir": "${HOME}$/py/rbac/models",
+    "output_dir": "${HOME}$/py/sage/wwwroot/_a/users",
+    "dbname": "sage",
+    "tblname": "users",
+	"title":"用户",
+    "params": {
+		"sortby":"username",
+        "browserfields": {
+            "exclouded": ["id"],
+            "cwidth": {}
+        },
+        "editexclouded": [
+            "id"
+        ],
+        "record_toolbar": null
+    }
+}