#8448 - devToTest #1254

Merged
alexm merged 365 commits from 8448-devToTest into test 2025-01-21 10:44:46 +00:00
1 changed files with 18 additions and 29 deletions
Showing only changes of commit e5d8bfcf3a - Show all commits

View File

@ -1,6 +1,6 @@
<script setup> <script setup>
import axios from 'axios'; import axios from 'axios';
import { computed, ref, toRefs } from 'vue'; import { computed, onMounted, ref, toRefs } from 'vue';
import { useI18n } from 'vue-i18n'; import { useI18n } from 'vue-i18n';
import { useVnConfirm } from 'composables/useVnConfirm'; import { useVnConfirm } from 'composables/useVnConfirm';
import { useRoute } from 'vue-router'; import { useRoute } from 'vue-router';
@ -30,6 +30,8 @@ const { notify } = useQuasar();
const account = computed(() => useArrayData('AccountId').store.data[0]); const account = computed(() => useArrayData('AccountId').store.data[0]);
account.value.hasAccount = hasAccount.value; account.value.hasAccount = hasAccount.value;
const entityId = computed(() => +route.params.id); const entityId = computed(() => +route.params.id);
const hasitManagementAccess = ref();
const hasSysadminAccess = ref();
async function updateStatusAccount(active) { async function updateStatusAccount(active) {
if (active) { if (active) {
await axios.post(`Accounts`, { id: entityId.value }); await axios.post(`Accounts`, { id: entityId.value });
@ -85,6 +87,15 @@ const onChangePass = (oldPass) => {
askOldPass.value = oldPass; askOldPass.value = oldPass;
changePassRef.value.show(); changePassRef.value.show();
}; };
onMounted(() => {
hasitManagementAccess.value = useAcl().hasAny([
{ model: 'VnUser', props: 'higherPrivileges', accessType: 'WRITE' },
]);
hasSysadminAccess.value = useAcl().hasAny([
{ model: 'VnUser', props: 'adminUser', accessType: 'WRITE' },
]);
});
</script> </script>
<template> <template>
<VnChangePassword <VnChangePassword
@ -131,11 +142,7 @@ const onChangePass = (oldPass) => {
</template> </template>
</VnConfirm> </VnConfirm>
<QItem <QItem
v-if=" v-if="hasitManagementAccess"
useAcl().hasAny([
{ model: 'VnUser', props: 'higherPrivileges', accessType: 'WRITE' },
])
"
v-ripple v-ripple
clickable clickable
@click=" @click="
@ -149,9 +156,7 @@ const onChangePass = (oldPass) => {
<QItemSection>{{ t('globals.delete') }}</QItemSection> <QItemSection>{{ t('globals.delete') }}</QItemSection>
</QItem> </QItem>
<QItem <QItem
v-if=" v-if="hasSysadminAccess"
useAcl().hasAny([{ model: 'AccountConfig', props: '*', accessType: 'WRITE' }])
"
v-ripple v-ripple
clickable clickable
@click="user.id === account.id ? onChangePass(true) : onChangePass(false)" @click="user.id === account.id ? onChangePass(true) : onChangePass(false)"
@ -162,10 +167,7 @@ const onChangePass = (oldPass) => {
<QItemSection v-else>{{ t('globals.setPass') }}</QItemSection> <QItemSection v-else>{{ t('globals.setPass') }}</QItemSection>
</QItem> </QItem>
<QItem <QItem
v-if=" v-if="!account.hasAccount && hasSysadminAccess"
!account.hasAccount &&
useAcl().hasAny([{ model: 'AccountConfig', props: '*', accessType: 'WRITE' }])
"
v-ripple v-ripple
clickable clickable
@click=" @click="
@ -179,10 +181,7 @@ const onChangePass = (oldPass) => {
<QItemSection>{{ t('account.card.actions.enableAccount.name') }}</QItemSection> <QItemSection>{{ t('account.card.actions.enableAccount.name') }}</QItemSection>
</QItem> </QItem>
<QItem <QItem
v-if=" v-if="account.hasAccount && hasSysadminAccess"
account.hasAccount &&
useAcl().hasAny([{ model: 'AccountConfig', props: '*', accessType: 'WRITE' }])
"
v-ripple v-ripple
clickable clickable
@click=" @click="
@ -197,12 +196,7 @@ const onChangePass = (oldPass) => {
</QItem> </QItem>
<QItem <QItem
v-if=" v-if="!account.active && hasitManagementAccess"
!account.active &&
useAcl().hasAny([
{ model: 'VnUser', props: 'higherPrivileges', accessType: 'WRITE' },
])
"
v-ripple v-ripple
clickable clickable
@click=" @click="
@ -216,12 +210,7 @@ const onChangePass = (oldPass) => {
<QItemSection>{{ t('account.card.actions.activateUser.name') }}</QItemSection> <QItemSection>{{ t('account.card.actions.activateUser.name') }}</QItemSection>
</QItem> </QItem>
<QItem <QItem
v-if=" v-if="account.active && hasitManagementAccess"
account.active &&
useAcl().hasAny([
{ model: 'VnUser', props: 'higherPrivileges', accessType: 'WRITE' },
])
"
v-ripple v-ripple
clickable clickable
@click=" @click="