diff --git a/src/components/RequireAuth.jsx b/src/components/RequireAuth.jsx
index 24bbdae..d8feee7 100644
--- a/src/components/RequireAuth.jsx
+++ b/src/components/RequireAuth.jsx
@@ -6,8 +6,9 @@ export default function RequireAuth({ children, ...props }, ) {
const isPermitted = useAuthStore((state) => state.isPermitted)
if (isPermitted(props.subject)) {
+ // if (props.subject === '/account/management') {
return children
- } else {
+ } else if (props.result) {
return (
},
{ path: "account/change-password", element: },
{ path: "account/profile", element: },
- { path: "account/management", element: },
+ { path: "account/management", element: },
{ path: "feedback", element: },
{ path: "feedback/:GRI_SN/:CII_SN/:RefNo", element: },
{ path: "feedback/:GRI_SN/:RefNo", element: },
diff --git a/src/views/account/Management.jsx b/src/views/account/Management.jsx
index 5f063e0..d98dbd8 100644
--- a/src/views/account/Management.jsx
+++ b/src/views/account/Management.jsx
@@ -3,8 +3,11 @@ import { Row, Col, Space, Button, Table, Select, TreeSelect, Typography, Modal,
import { ExclamationCircleFilled } from '@ant-design/icons'
import { useTranslation } from 'react-i18next'
import useFormStore from '@/stores/Form'
+import useAuthStore from '@/stores/Auth'
import useReservationStore from '@/stores/Reservation'
import SearchForm from '@/components/SearchForm'
+import RequireAuth from '@/components/RequireAuth'
+import { PERM_ROLE_NEW } from '@/config'
const { Title } = Typography
@@ -69,6 +72,7 @@ const permissionData = [
function Management() {
const { t } = useTranslation()
+
const accountListColumns = [
{
title: t('account:username'),
@@ -174,6 +178,9 @@ function Management() {
const formValuesToSub = useFormStore((state) => state.formValuesToSub)
+
+ const isPermitted = useAuthStore((state) => state.isPermitted)
+
const [editAccountForm, editRoleForm] = Form.useForm()
const [fetchReservationList] =
useReservationStore((state) =>
@@ -388,7 +395,9 @@ function Management() {
-
+
+
+