Merge pull request 'Warmfix[Submodule Descriptors]: Fixed submodule descriptors icons' (!1616) from Warmfix-SubModulesIcons into test
gitea/salix-front/pipeline/head This commit looks good
Details
gitea/salix-front/pipeline/head This commit looks good
Details
Reviewed-on: #1616 Reviewed-by: Alex Moreno <alexm@verdnatura.es>
This commit is contained in:
commit
0110ad3437
|
@ -134,9 +134,7 @@ const emit = defineEmits(['onFetch']);
|
|||
const iconModule = computed(() => {
|
||||
moduleName.value = getName();
|
||||
if ($props.toModule) {
|
||||
return router
|
||||
.getRoutes()
|
||||
.find((r) => r.name && r.name.includes($props.toModule.name)).meta.icon;
|
||||
return router.getRoutes().find((r) => r.name === $props.toModule.name).meta.icon;
|
||||
}
|
||||
if (isSameModuleName) {
|
||||
return router.options.routes[1].children.find((r) => r.name === moduleName.value)
|
||||
|
|
|
@ -53,6 +53,7 @@ const removeAlias = () => {
|
|||
:url="`MailAliases/${entityId}`"
|
||||
data-key="Alias"
|
||||
title="alias"
|
||||
:to-module="{ name: 'AccountAlias' }"
|
||||
>
|
||||
<template #menu>
|
||||
<QItem v-ripple clickable @click="removeAlias()">
|
||||
|
|
|
@ -30,6 +30,7 @@ const entityId = computed(() => {
|
|||
:filter="filter"
|
||||
title="code"
|
||||
data-key="ItemType"
|
||||
:to-module="{ name: 'ItemTypeList' }"
|
||||
>
|
||||
<template #body="{ entity }">
|
||||
<VnLv :label="$t('itemType.shared.code')" :value="entity.code" />
|
||||
|
|
|
@ -26,6 +26,7 @@ const card = computed(() => store.data);
|
|||
:url="`Agencies/${entityId}`"
|
||||
:title="card?.name"
|
||||
:subtitle="props.id"
|
||||
:to-module="{ name: 'RouteAgency' }"
|
||||
>
|
||||
<template #body="{ entity: agency }">
|
||||
<VnLv :label="t('globals.name')" :value="agency.name" />
|
||||
|
|
|
@ -35,6 +35,7 @@ const entityId = computed(() => {
|
|||
:filter="filter"
|
||||
data-key="Roadmap"
|
||||
:summary="summary"
|
||||
:to-module="{ name: 'RouteRoadmap' }"
|
||||
>
|
||||
<template #body="{ entity }">
|
||||
<VnLv :label="t('Roadmap')" :value="entity?.name" />
|
||||
|
|
|
@ -24,6 +24,7 @@ const entityId = computed(() => props.id || route.params.id);
|
|||
:url="`Vehicles/${entityId}`"
|
||||
data-key="Vehicle"
|
||||
title="numberPlate"
|
||||
:to-module="{ name: 'RouteVehicle' }"
|
||||
>
|
||||
<template #menu="{ entity }">
|
||||
<QItem
|
||||
|
|
|
@ -21,7 +21,7 @@ const entityId = computed(() => props.id || route.params.id);
|
|||
:url="`Parkings/${entityId}`"
|
||||
title="code"
|
||||
:filter="filter"
|
||||
:to-module="{ name: 'ParkingList' }"
|
||||
:to-module="{ name: 'ParkingMain' }"
|
||||
>
|
||||
<template #body="{ entity }">
|
||||
<VnLv :label="$t('globals.code')" :value="entity.code" />
|
||||
|
|
Loading…
Reference in New Issue