flfeders/FEDEO
2
1
Fork 0
Code Issues 106 Pull Requests Actions Packages Projects 22 Releases Wiki Activity

Handle missing tables in tenant merge
All checks were successful
Build and Push Docker Images / build-central-services-api (push) Successful in 24s
Details
Build and Push Docker Images / build-central-services-admin (push) Successful in 24s
Details
Build and Push Docker Images / build-docs (push) Successful in 24s
Details
Build and Push Docker Images / build-backend (push) Successful in 38s
Details
Build and Push Docker Images / build-frontend (push) Successful in 1m42s
Details
Build and Push Docker Images / build-website (push) Successful in 27s
Details

Browse Source
This commit is contained in:
Florian Federspiel
2026-08-06 14:52:38 +02:00
parent 5a05d2e9e8
commit c66d04f0b5
2 changed files with 46 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
frontend/pages/administration/tenant-imports/[importId].vue
View File

@@ -217,12 +217,14 @@ onMounted(async () => {
</p>
<div v-if="item.kind === 'conflict'" class="flex flex-wrap gap-2">
<UButton
v-if="item.allowedDecisions.includes('target')"
size="sm"
:color="decisions[item.id] === 'target' ? 'primary' : 'neutral'"
:variant="decisions[item.id] === 'target' ? 'solid' : 'soft'"
@click="decisions[item.id] = 'target'"
>Ziel behalten</UButton>
<UButton
v-if="item.allowedDecisions.includes('source')"
size="sm"
:color="decisions[item.id] === 'source' ? 'warning' : 'neutral'"
:variant="decisions[item.id] === 'source' ? 'solid' : 'soft'"