#4074 useAcls #584

Merged
jorgep merged 30 commits from 4074-useAcls into dev 2024-09-10 11:50:45 +00:00
2 changed files with 9 additions and 11 deletions
Showing only changes of commit 3fafb15eb8 - Show all commits

View File

@ -20,6 +20,7 @@ const route = useRoute();
const { t } = useI18n();
const entityId = computed(() => $props.id || route.params.id);
const getUrl = (id, param) => `#/Item/${id}/${param}`;
</script>
<template>
<CardSummary
@ -53,7 +54,7 @@ const entityId = computed(() => $props.id || route.params.id);
</QCard>
<QCard class="vn-one">
<VnTitle
:url="`#/item/${entityId}/basic-data`"
:url="getUrl(entityId, 'basic-data')"
:text="t('item.summary.basicData')"
/>
<VnLv :label="t('item.summary.name')" :value="item.name" />
@ -87,7 +88,7 @@ const entityId = computed(() => $props.id || route.params.id);
</QCard>
<QCard class="vn-one">
<VnTitle
:url="`#/item/${entityId}/basic-data`"
:url="getUrl(entityId, 'basic-data')"
:text="t('item.summary.otherData')"
/>
<VnLv
@ -114,10 +115,7 @@ const entityId = computed(() => $props.id || route.params.id);
/>
</QCard>
<QCard class="vn-one">
<VnTitle
:url="`#/item/${entityId}/tags`"
:text="t('item.summary.tags')"
/>
<VnTitle :url="getUrl(entityId, 'tags')" :text="t('item.summary.tags')" />
<VnLv
v-for="(tag, index) in tags"
:key="index"
@ -127,13 +125,13 @@ const entityId = computed(() => $props.id || route.params.id);
</QCard>
<QCard class="vn-one" v-if="item.description">
<VnTitle
:url="`#/item/${entityId}/basic-data`"
:url="getUrl(entityId, 'basic-data')"
:text="t('item.summary.description')"
/>
<p v-text="item.description" />
</QCard>
<QCard class="vn-one">
<VnTitle :url="`#/item/${entityId}/tax`" :text="t('item.summary.tax')" />
<VnTitle :url="getUrl(entityId, 'tax')" :text="t('item.summary.tax')" />
<VnLv
v-for="(tax, index) in item.taxes"
:key="index"
@ -143,7 +141,7 @@ const entityId = computed(() => $props.id || route.params.id);
</QCard>
<QCard class="vn-one">
<VnTitle
:url="`#/item/${entityId}/botanical`"
:url="getUrl(entityId, 'botanical')"
:text="t('item.summary.botanical')"
/>
<VnLv :label="t('item.summary.genus')" :value="botanical?.genus?.name" />
@ -154,7 +152,7 @@ const entityId = computed(() => $props.id || route.params.id);
</QCard>
<QCard class="vn-one">
<VnTitle
:url="`#/item/${entityId}/barcode`"
:url="getUrl(entityId, 'barcode')"
:text="t('item.summary.barcode')"
/>
<p

View File

@ -52,7 +52,7 @@ describe('Login', () => {
cy.url().should('contain', '/login');
});
it(`should get redirected to dashboard since employee can't create tickets`, () => {
it(`should be redirected to dashboard since the employee is not enabled to see ldap`, () => {
cy.visit('/#/account/ldap', { failOnStatusCode: false });

Habían puesto que solo podía el role developer. Esto en Salix no estaba.

Habían puesto que solo podía el role developer. Esto en Salix no estaba.
Review

Hermos cambiado la URL pero no hemos cambiado el it del test...

Hermos cambiado la URL pero no hemos cambiado el it del test...
cy.url().should('contain', '/#/login?redirect=/account/ldap');
cy.get('input[aria-label="Username"]').type('employee');