solveConflicts_test_to_dev #957

Merged
alexm merged 58 commits from solveConflicts_test_to_dev into dev 2024-11-18 10:21:51 +00:00
1 changed files with 3 additions and 2 deletions
Showing only changes of commit 259f0e30af - Show all commits

View File

@ -20,10 +20,11 @@ function notIsLocations(ifIsFalse, ifIsTrue) {
<template>
<VnCard
data-key="zone"
base-url="Zones"
:base-url="notIsLocations('Zones', undefined)"
:descriptor="ZoneDescriptor"
:filter-panel="ZoneFilterPanel"
:filter-panel="notIsLocations(ZoneFilterPanel, undefined)"
:search-data-key="notIsLocations('ZoneList', 'ZoneLocations')"
:custom-url="`Zones/${route.params?.id}/getLeaves`"
:searchbar-props="{
url: notIsLocations('ZoneList', 'ZoneLocations'),
label: notIsLocations(t('list.searchZone'), t('list.searchLocation')),