verdnatura/salix-front
verdnatura
/
salix-front
2
3
Fork 1
Code Issues Pull Requests 73 Releases Wiki Activity

test_dev_resolveConflicts #647

Merged
jsegarra merged 40 commits from test_dev_resolveConflicts into dev 2024-08-27 07:10:20 +00:00
Conversation 0 Commits 40 Files Changed 20 +2 -2
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit ed3b604c76 - Show all commits

2
src/pages/Account/Card/AccountDescriptor.vue
View File

@ -72,7 +72,7 @@ const hasAccount = ref(false);
</VnImg> </VnImg>
</template> </template>
<template #body="{ entity }"> <template #body="{ entity }">
<VnLv :label="t('account.card.nickname')" :value="entity.nickname" /> <VnLv :label="t('account.card.nickname')" :value="entity.name" />
<VnLv :label="t('account.card.role')" :value="entity.role.name" /> <VnLv :label="t('account.card.role')" :value="entity.role.name" />
</template> </template>
<template #actions="{ entity }"> <template #actions="{ entity }">

2
src/pages/Account/Card/AccountSummary.vue
View File

@ -48,7 +48,7 @@ const filter = {
<QIcon name="open_in_new" /> <QIcon name="open_in_new" />
</router-link> </router-link>
</QCardSection> </QCardSection>
<VnLv :label="t('account.card.nickname')" :value="account.nickname" /> <VnLv :label="t('account.card.nickname')" :value="account.name" />
<VnLv :label="t('account.card.role')" :value="account.role.name" /> <VnLv :label="t('account.card.role')" :value="account.role.name" />
</QCard> </QCard>
</template> </template>