Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev
gitea/salix-front/pipeline/head There was a failure building this commit Details

This commit is contained in:
Alex Moreno 2025-03-04 15:10:09 +01:00
commit 5f0f9e6475
2 changed files with 6 additions and 6 deletions

1
Jenkinsfile vendored
View File

@ -26,6 +26,7 @@ node {
// https://www.jenkins.io/doc/book/pipeline/jenkinsfile/#using-environment-variables // https://www.jenkins.io/doc/book/pipeline/jenkinsfile/#using-environment-variables
echo "NODE_NAME: ${env.NODE_NAME}" echo "NODE_NAME: ${env.NODE_NAME}"
echo "WORKSPACE: ${env.WORKSPACE}" echo "WORKSPACE: ${env.WORKSPACE}"
echo "CHANGE_TARGET: ${env.CHANGE_TARGET}"
configFileProvider([ configFileProvider([
configFile(fileId: 'salix-front.properties', configFile(fileId: 'salix-front.properties',

View File

@ -9,22 +9,22 @@ import VnInputTime from 'src/components/common/VnInputTime.vue';
import VnSelect from 'src/components/common/VnSelect.vue'; import VnSelect from 'src/components/common/VnSelect.vue';
const { t } = useI18n(); const { t } = useI18n();
const validAddresses = ref([]);
const addresses = ref([]); const addresses = ref([]);
const setFilteredAddresses = (data) => { const setFilteredAddresses = (data) => {
const validIds = new Set(validAddresses.value.map((item) => item.addressFk)); addresses.value = data.map(({ address }) => address);
addresses.value = data.filter((address) => validIds.has(address.id));
}; };
</script> </script>
<template> <template>
<FetchData <FetchData
url="RoadmapAddresses" url="RoadmapAddresses"
:filter="{
include: { relation: 'address' },
}"
auto-load auto-load
@on-fetch="(data) => (validAddresses = data)" @on-fetch="setFilteredAddresses"
/> />
<FetchData url="Addresses" auto-load @on-fetch="setFilteredAddresses" />
<FormModel auto-load model="Zone"> <FormModel auto-load model="Zone">
<template #form="{ data, validate }"> <template #form="{ data, validate }">
<VnRow> <VnRow>
@ -125,7 +125,6 @@ const setFilteredAddresses = (data) => {
map-options map-options
:rules="validate('data.addressFk')" :rules="validate('data.addressFk')"
:filter-options="['id']" :filter-options="['id']"
:where="filterWhere"
/> />
</VnRow> </VnRow>
<VnRow> <VnRow>