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

#4074 useAcls #584

Merged
jorgep merged 30 commits from 4074-useAcls into dev 2024-09-10 11:50:45 +00:00
Conversation 0 Commits 30 Files Changed 32 +44 -85
2 changed files with 44 additions and 85 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit b87e7ce750 - Show all commits

4
src/css/app.scss
View File

@ -37,6 +37,10 @@ a {
.link {
color: $color-link;
cursor: pointer;
&--white {
color: white;
}
}
.tx-color-link {

125
src/pages/Item/Card/ItemSummary.vue
View File

@ -7,9 +7,7 @@ import CardSummary from 'components/ui/CardSummary.vue';
import VnLv from 'src/components/ui/VnLv.vue';
import ItemDescriptorImage from 'src/pages/Item/Card/ItemDescriptorImage.vue';
import VnUserLink from 'src/components/ui/VnUserLink.vue';
import { useRole } from 'src/composables/useRole';
import { useAcl } from 'src/composables/useAcl';
import VnTitle from 'src/components/common/VnTitle.vue';
jsegarra commented 2024-09-09 17:41:28 +00:00
Review
Copy Link

Porque se modifica este componente reemplazando por VnTitle??

Porque se modifica este componente reemplazando <component /> por VnTitle??
jorgep commented 2024-09-10 06:58:12 +00:00
Review
Copy Link

Porque es un summary, los summary gastan VnTitle. Si te fijas, gasta un router-link o un span con la clase link...

Porque es un summary, los summary gastan VnTitle. Si te fijas, gasta un router-link o un span con la clase link...
jorgep marked this conversation as resolved
jsegarra commented 2024-09-09 17:42:23 +00:00
Review
Copy Link

Porque no se hace con el archivo siguiente, crear una funcion llamada getUrl??

Porque no se hace con el archivo siguiente, crear una funcion llamada getUrl??
jorgep commented 2024-09-10 07:10:34 +00:00
Review
Copy Link

No veo la necesidad, pero te lo cambio.

No veo la necesidad, pero te lo cambio.
const $props = defineProps({
id: {
@ -22,13 +20,7 @@ const route = useRoute();
const { t } = useI18n();
const entityId = computed(() => $props.id || route.params.id);
const canEdit = computed(() => useAcl().hasAny('Item', '*', 'WRITE'));
const isReplenisher = computed(() => useRole().hasAny(['replenisher']));
</script>
<template>
<CardSummary
ref="summary"
@ -37,13 +29,15 @@ const isReplenisher = computed(() => useRole().hasAny(['replenisher']));
data-key="ItemSummary"
>
<template #header-left>
<router-link
v-if="route.name !== 'ItemSummary'"
<QBtn
v-if="$route.name !== 'ItemSummary'"
:to="{ name: 'ItemSummary', params: { id: entityId } }"
class="header link"
>
<QIcon name="open_in_new" color="white" size="sm" />
</router-link>
class="header link--white"
icon="open_in_new"
flat
dense
round
/>
</template>
<template #header="{ entity: { item } }">
{{ item.id }} - {{ item.name }}
@ -58,15 +52,10 @@ const isReplenisher = computed(() => useRole().hasAny(['replenisher']));
/>
</QCard>
<QCard class="vn-one">
<component
:is="canEdit ? 'router-link' : 'span'"
:to="{ name: 'ItemBasicData', params: { id: entityId } }"
class="header"
:class="{ 'header-link': canEdit }"
>
{{ t('item.summary.basicData') }}
<QIcon v-if="canEdit" name="open_in_new" />
</component>
<VnTitle
:url="`#/item/${entityId}/basic-data`"
:text="t('item.summary.basicData')"
/>
<VnLv :label="t('item.summary.name')" :value="item.name" />
<VnLv :label="t('item.summary.completeName')" :value="item.longName" />
<VnLv :label="t('item.summary.family')" :value="item.itemType.name" />
@ -97,15 +86,10 @@ const isReplenisher = computed(() => useRole().hasAny(['replenisher']));
</VnLv>
</QCard>
<QCard class="vn-one">
<component
:is="canEdit ? 'router-link' : 'span'"
:to="{ name: 'ItemBasicData', params: { id: entityId } }"
class="header"
:class="{ 'header-link': canEdit }"
>
{{ t('item.summary.otherData') }}
<QIcon v-if="canEdit" name="open_in_new" />
</component>
<VnTitle
:url="`#/item/${entityId}/basic-data`"
:text="t('item.summary.otherData')"
/>
<VnLv
:label="t('item.summary.intrastatCode')"
:value="item.intrastat.id"
@ -130,15 +114,10 @@ const isReplenisher = computed(() => useRole().hasAny(['replenisher']));
/>
</QCard>
<QCard class="vn-one">
<component
:is="canEdit || isReplenisher ? 'router-link' : 'span'"
:to="{ name: 'ItemTags', params: { id: entityId } }"
class="header"
:class="{ 'header-link': canEdit || isReplenisher }"
>
{{ t('item.summary.tags') }}
<QIcon v-if="canEdit || isReplenisher" name="open_in_new" />
</component>
<VnTitle
:url="`#/item/${entityId}/tags`"
:text="t('item.summary.tags')"
/>
<VnLv
v-for="(tag, index) in tags"
:key="index"
@ -147,29 +126,14 @@ const isReplenisher = computed(() => useRole().hasAny(['replenisher']));
/>
</QCard>
<QCard class="vn-one" v-if="item.description">
<component
:is="canEdit ? 'router-link' : 'span'"
:to="{ name: 'ItemBasicData', params: { id: entityId } }"
class="header"
:class="{ 'header-link': canEdit }"
>
{{ t('item.summary.description') }}
<QIcon v-if="canEdit" name="open_in_new" />
</component>
<p>
{{ item.description }}
</p>
<VnTitle
:url="`#/item/${entityId}/basic-data`"
:text="t('item.summary.description')"
/>
<p v-text="item.description" />
</QCard>
<QCard class="vn-one">
<component
:is="canEdit ? 'router-link' : 'span'"
:to="{ name: 'ItemTax', params: { id: entityId } }"
class="header"
:class="{ 'header-link': canEdit }"
>
{{ t('item.summary.tax') }}
<QIcon v-if="canEdit" name="open_in_new" />
</component>
<VnTitle :url="`#/item/${entityId}/tax`" :text="t('item.summary.tax')" />
<VnLv
v-for="(tax, index) in item.taxes"
:key="index"
@ -178,15 +142,10 @@ const isReplenisher = computed(() => useRole().hasAny(['replenisher']));
/>
</QCard>
<QCard class="vn-one">
<component
:is="canEdit ? 'router-link' : 'span'"
:to="{ name: 'ItemBotanical', params: { id: entityId } }"
class="header"
:class="{ 'header-link': canEdit }"
>
{{ t('item.summary.botanical') }}
<QIcon v-if="canEdit" name="open_in_new" />
</component>
<VnTitle
:url="`#/item/${entityId}/botanical`"
:text="t('item.summary.botanical')"
/>
<VnLv :label="t('item.summary.genus')" :value="botanical?.genus?.name" />
<VnLv
:label="t('item.summary.specie')"
@ -194,23 +153,19 @@ const isReplenisher = computed(() => useRole().hasAny(['replenisher']));
/>
</QCard>
<QCard class="vn-one">
<component
:is="canEdit || isReplenisher ? 'router-link' : 'span'"
:to="{ name: 'ItemBarcode', params: { id: entityId } }"
class="header"
:class="{ 'header-link': canEdit || isReplenisher }"
>
{{ t('item.summary.barcode') }}
<QIcon v-if="canEdit || isReplenisher" name="open_in_new" />
</component>
<p v-for="(barcode, index) in item.itemBarcode" :key="index">
{{ barcode.code }}
</p>
<VnTitle
:url="`#/item/${entityId}/barcode`"
:text="t('item.summary.barcode')"
/>
<p
v-for="(barcode, index) in item.itemBarcode"
:key="index"
v-text="barcode.code"
/>
</QCard>
</template>
</CardSummary>
</template>
<i18n>
en:
Este artículo necesita una foto: Este artículo necesita una foto