Merge branch 'access_object'

This commit is contained in:
Carter 2025-10-21 13:41:42 -06:00
commit d5ef3c956f
2 changed files with 4 additions and 3 deletions

View file

@ -108,7 +108,8 @@ export default function Users() {
"remove-devices", "remove-devices",
"copy-token", "copy-token",
"recluse", "recluse",
"pause-data" "pause-data",
"access-object"
].sort(); ].sort();
const features = [ const features = [
"admin", "admin",

View file

@ -266,7 +266,7 @@ export default function UserMenu() {
</MenuItem> </MenuItem>
)} )}
<Divider /> <Divider />
{hasAdmin && ( {(hasAdmin || user.allowedTo("access-object")) && (
<Tooltip title="Access Object"> <Tooltip title="Access Object">
<MenuItem onClick={() => openAccessObject()} aria-label="Access Object" dense> <MenuItem onClick={() => openAccessObject()} aria-label="Access Object" dense>
<ListItemIcon> <ListItemIcon>
@ -276,7 +276,7 @@ export default function UserMenu() {
</MenuItem> </MenuItem>
</Tooltip> </Tooltip>
)} )}
<Divider /> {(hasAdmin || user.allowedTo("access-object")) && <Divider /> }
<MenuItem onClick={handleLogout} aria-label="Sign Out" dense> <MenuItem onClick={handleLogout} aria-label="Sign Out" dense>
<ListItemIcon> <ListItemIcon>
<ExitToApp className={classes.red} /> <ExitToApp className={classes.red} />