joseph
/
ManagementSystem
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request 'cập nhật kiểm tra quyền để hiển menu' (#16) from truong-sprint-1 into master 

Reviewed-on: #16
This commit is contained in:
vincent.vo 2024-08-15 11:51:58 +10:00
parent 78048634c2 4c3ca95bb5
commit b4b73716c9
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
FRONTEND/src/components/Navbar/Navbar.tsx
View File

@ -167,7 +167,7 @@ const Navbar = ({
display={
g.name === 'normal'
? 'block'
: user?.user?.permission === g.name
: user?.user?.permission.includes(g.name)
? 'block'
: 'none'
}
@ -181,7 +181,7 @@ const Navbar = ({
.filter((i) => {
return (
i.group === g.name &&
(user?.user?.permission === 'admin' || g.name !== 'admin')
(user?.user?.permission.includes('admin') || g.name !== 'admin')
)
})
.map((item) => (

2
FRONTEND/src/rtk/localStorage.ts
View File

@ -22,7 +22,7 @@ export const checkPermissionAdmin = () => {
const user = localStorage.getItem('user')
if (user) {
const parsedUser = JSON.parse(user)
if (parsedUser.user.permission == 'admin') {
if (parsedUser.user.permission.includes('admin')) {
return true
} else {
return false