Merge branch 'develop' into milestone/ff-admin-unit

# Conflicts:
#	package-lock.json
#	package.json
This commit is contained in:
Julian Krauser 2025-07-25 09:29:01 +02:00
commit 0b16599d2a
13 changed files with 198 additions and 107 deletions

View file

@ -33,7 +33,8 @@ 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;

View file

@ -49,7 +49,8 @@ export const useMembershipStore = defineStore("membership", {
http
.get(`/admin/member/${memberId}/memberships/totalstatistics`)
.then((result) => {
this.totalMembershipStatistics = result.data;
if (result.status == 200) this.totalMembershipStatistics = result.data;
else this.totalMembershipStatistics = undefined;
})
.catch((err) => {});
},

View file

@ -37,6 +37,11 @@ export const useNavigationStore = defineStore("navigation", {
};
},
getters: {
topLevelObject: (state) =>
state.topLevel.map((tl) => ({
...tl,
levelDefault: state.navigation[tl.key].main.filter((m) => !m.key.includes("divider"))[0]?.key ?? "",
})),
activeNavigationObject: (state) => (state.navigation[state.activeNavigation] ?? {}) as navigationSplitModel,
activeTopLevelObject: (state) =>
(state.topLevel.find((elem) => elem.key == state.activeNavigation) ?? {}) as topLevelNavigationModel,