forked from verdnatura/salix-front
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into dev
This commit is contained in:
commit
e88e7fa9db
|
@ -159,6 +159,14 @@ const isEmployee = computed(() => useRole().isEmployee());
|
||||||
size="xxl"
|
size="xxl"
|
||||||
color="transparent"
|
color="transparent"
|
||||||
/>
|
/>
|
||||||
|
<QBtn
|
||||||
|
v-if="isEmployee"
|
||||||
|
class="q-mt-sm q-px-md"
|
||||||
|
:to="`/worker/${user.id}`"
|
||||||
|
color="primary"
|
||||||
|
:label="t('My account')"
|
||||||
|
dense
|
||||||
|
/>
|
||||||
<div class="text-subtitle1 q-mt-md">
|
<div class="text-subtitle1 q-mt-md">
|
||||||
<strong>{{ user.nickname }}</strong>
|
<strong>{{ user.nickname }}</strong>
|
||||||
</div>
|
</div>
|
||||||
|
@ -262,3 +270,7 @@ const isEmployee = computed(() => useRole().isEmployee());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
</style>
|
</style>
|
||||||
|
<i18n>
|
||||||
|
es:
|
||||||
|
My account: Mi cuenta
|
||||||
|
</i18n>
|
||||||
|
|
|
@ -407,9 +407,12 @@ watch(
|
||||||
@on-fetch="
|
@on-fetch="
|
||||||
(data) =>
|
(data) =>
|
||||||
(actions = data.map((item) => {
|
(actions = data.map((item) => {
|
||||||
|
const changedModel = item.changedModel;
|
||||||
return {
|
return {
|
||||||
locale: useCapitalize(validations[item.changedModel].locale.name),
|
locale: useCapitalize(
|
||||||
value: item.changedModel,
|
validations[changedModel]?.locale?.name ?? changedModel
|
||||||
|
),
|
||||||
|
value: changedModel,
|
||||||
};
|
};
|
||||||
}))
|
}))
|
||||||
"
|
"
|
||||||
|
|
|
@ -8,7 +8,7 @@ describe('Logout', () => {
|
||||||
describe('by user', () => {
|
describe('by user', () => {
|
||||||
it('should logout', () => {
|
it('should logout', () => {
|
||||||
cy.get('#user').click();
|
cy.get('#user').click();
|
||||||
cy.get('.block').click();
|
cy.get('#logout').click();
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
describe('not user', () => {
|
describe('not user', () => {
|
||||||
|
|
Loading…
Reference in New Issue