Add check for submitPermissionEdit()

casdoor · Aug 18, 2022 · d4802c0 · d4802c0
1 parent 8e9ed12
commit d4802c0
Show file tree

Hide file tree

Showing 2 changed files with 57 additions and 1 deletion.
diff --git a/web/src/PermissionEditPage.js b/web/src/PermissionEditPage.js
@@ -370,6 +370,23 @@ class PermissionEditPage extends React.Component {
   }
 
   submitPermissionEdit(willExist) {
+    if (this.state.permission.users.length === 0 && this.state.permission.roles.length === 0) {
+      Setting.showMessage("error", "The users and roles cannot be empty at the same time");
+      return;
+    }
+    if (this.state.permission.domains.length === 0) {
+      Setting.showMessage("error", "The domains cannot be empty");
+      return;
+    }
+    if (this.state.permission.resources.length === 0) {
+      Setting.showMessage("error", "The resources cannot be empty");
+      return;
+    }
+    if (this.state.permission.actions.length === 0) {
+      Setting.showMessage("error", "The actions cannot be empty");
+      return;
+    }
+
     const permission = Setting.deepCopy(this.state.permission);
     PermissionBackend.updatePermission(this.state.organizationName, this.state.permissionName, permission)
       .then((res) => {

diff --git a/web/src/PermissionListPage.js b/web/src/PermissionListPage.js
@@ -215,6 +215,45 @@ class PermissionListPage extends BaseListPage {
           );
         },
       },
+      {
+        title: i18next.t("permission:Submitter"),
+        dataIndex: "submitter",
+        key: "submitter",
+        filterMultiple: false,
+        width: "120px",
+        sorter: true,
+      },
+      {
+        title: i18next.t("permission:Approver"),
+        dataIndex: "approver",
+        key: "approver",
+        filterMultiple: false,
+        width: "120px",
+        sorter: true,
+      },
+      {
+        title: i18next.t("permission:Approve time"),
+        dataIndex: "approveTime",
+        key: "approveTime",
+        filterMultiple: false,
+        width: "120px",
+        sorter: true,
+        render: (text, record, index) => {
+          return Setting.getFormattedDate(text);
+        },
+      },
+      {
+        title: i18next.t("permission:State"),
+        dataIndex: "state",
+        key: "state",
+        filterMultiple: false,
+        filters: [
+          {text: "Approved", value: "Approved"},
+          {text: "Pending", value: "Pending"},
+        ],
+        width: "120px",
+        sorter: true,
+      },
       {
         title: i18next.t("general:Action"),
         dataIndex: "",
@@ -269,7 +308,7 @@ class PermissionListPage extends BaseListPage {
     }
     this.setState({loading: true});
 
-    const getPermissions = Setting.isAdminUser(this.props.account) ? PermissionBackend.getPermissions : PermissionBackend.getPermissionsBySubmitter;
+    const getPermissions = Setting.isLocalAdminUser(this.props.account) ? PermissionBackend.getPermissions : PermissionBackend.getPermissionsBySubmitter;
     getPermissions("", params.pagination.current, params.pagination.pageSize, field, value, sortField, sortOrder)
       .then((res) => {
         if (res.status === "ok") {