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

8032-devToTest_2440 #751

Merged
alexm merged 319 commits from 8032-devToTest_2440 into test 2024-09-24 10:05:33 +00:00
Conversation 0 Commits 319 Files Changed 169 +9 -11
2 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 3fafb15eb8 - Show all commits

18
src/pages/Item/Card/ItemSummary.vue
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

2
test/cypress/integration/outLogin/login.spec.js
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 });
cy.url().should('contain', '/#/login?redirect=/account/ldap');
cy.get('input[aria-label="Username"]').type('employee');