sites: add conflict detection

Fixes #863
2026-03-14 23:27:27 +05:30
parent 8f1f3645b2
commit 0b305caf58
9 changed files with 65 additions and 40 deletions
@@ -3,7 +3,7 @@
 import { ref, useTemplateRef, watch } from 'vue';
 import { MaskedInput, Dialog, FormGroup, TextInput, Checkbox } from '@cloudron/pankow';
 import { prettyBinarySize } from '@cloudron/pankow/utils';
-import { s3like, mountlike, prettySiteLocation } from  '../utils.js';
+import { s3like, mountlike } from  '../utils.js';
 import BackupSitesModel from '../models/BackupSitesModel.js';
 import SystemModel from '../models/SystemModel.js';

@@ -205,7 +205,7 @@ defineExpose({

            <FormGroup v-if="site.provider && site.config">
              <label><i v-if="site.encrypted" class="fa-solid fa-lock"></i> Storage: <b>{{ site.provider }} ({{ site.format }}) </b></label>
-              <div>{{ prettySiteLocation(site) }}</div>
+              <div>{{ site.locationLabel }}</div>
            </FormGroup>

            <FormGroup v-if="provider === 'sshfs'">