Ehrenamt/ff-admin
2
0
Fork 0
Code Issues 12 Pull requests Projects Releases 22 Packages Wiki Activity Actions

patches v1.5.3 #96

Merged
jkeffects merged 5 commits from develop into main 2025-05-19 11:25:49 +00:00
Conversation 0 Commits 5 Files changed 58 +22 -7
2 changed files with 22 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 4ee16c624a - Show all commits

23
src/stores/ability.ts
View file

@ -33,13 +33,21 @@ export const useAbilityStore = defineStore("ability", {
if (type == "admin") return permissions?.admin ?? permissions?.adminByOwner ?? false;
if (permissions?.admin || permissions?.adminByOwner) return true;
if (
permissions[section]?.all == "*" ||
permissions[section]?.all?.includes(type) ||
(permissions[section]?.all == "*" || permissions[section]?.all?.includes(type)) &&
permissions[section] != undefined
)
return true;
return false;
},
canAccessSection:
(state) =>
(section: PermissionSection): boolean => {
const permissions = state.permissions;
if (state.isOwner) return true;
if (permissions?.admin || permissions?.adminByOwner) return true;
if (permissions[section] != undefined) return true;
return false;
},
isAdmin: (state) => (): boolean => {
const permissions = state.permissions;
if (state.isOwner) return true;
@ -72,13 +80,20 @@ export const useAbilityStore = defineStore("ability", {
if (type == "admin") return permissions?.admin ?? permissions?.adminByOwner ?? false;
if (permissions?.admin || permissions?.adminByOwner) return true;
if (
permissions[section]?.all == "*" ||
permissions[section]?.all?.includes(type) ||
(permissions[section]?.all == "*" || permissions[section]?.all?.includes(type)) &&
permissions[section] != undefined
)
return true;
return false;
},
_canAccessSection:
() =>
(permissions: PermissionObject, section: PermissionSection): boolean => {
// ignores ownership
if (permissions?.admin || permissions?.adminByOwner) return true;
if (permissions[section] != undefined) return true;
return false;
},
},
actions: {
setAbility(permissions: PermissionObject, isOwner: boolean) {

6
src/stores/admin/navigation.ts
View file

@ -48,7 +48,7 @@ export const useNavigationStore = defineStore("navigation", {
updateTopLevel() {
const abilityStore = useAbilityStore();
this.topLevel = [
...(abilityStore.canSection("read", "club")
...(abilityStore.canAccessSection("club")
? [
{
key: "club",
@ -57,7 +57,7 @@ export const useNavigationStore = defineStore("navigation", {
} as topLevelNavigationModel,
]
: []),
...(abilityStore.canSection("read", "configuration")
...(abilityStore.canAccessSection("configuration")
? [
{
key: "configuration",
@ -66,7 +66,7 @@ export const useNavigationStore = defineStore("navigation", {
} as topLevelNavigationModel,
]
: []),
...(abilityStore.canSection("read", "management")
...(abilityStore.canAccessSection("management")
? [
{
key: "management",