From 5d65c76686d85d3720541a6bff5e6c9d29f43538 Mon Sep 17 00:00:00 2001
From: vabene1111 <vabene1234@googlemail.com>
Date: Thu, 19 Jun 2025 17:36:39 +0200
Subject: [PATCH] small fixes

---
 vue3/src/components/display/DatabaseLinkCol.vue  |  4 ++--
 vue3/src/components/display/DatabaseModelCol.vue |  2 +-
 vue3/src/components/inputs/ModelSelect.vue       | 14 ++++++++------
 vue3/src/pages/ModelListPage.vue                 |  4 ++--
 4 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/vue3/src/components/display/DatabaseLinkCol.vue b/vue3/src/components/display/DatabaseLinkCol.vue
index 8e6f9cc86..a41242985 100644
--- a/vue3/src/components/display/DatabaseLinkCol.vue
+++ b/vue3/src/components/display/DatabaseLinkCol.vue
@@ -1,6 +1,6 @@
 <template>
     <v-col :cols="props.cols" :md="props.md" :lg="props.lg">
-        <v-card :prepend-icon="props.prependIcon" :title="props.title" :subtitle="props.subtitle" variant="outlined" elevation="1"
+        <v-card :prepend-icon="props.prependIcon" :title="props.title" :subtitle="props.subtitle"
                 :to="props.to" :link="isLink" :href="props.href"
                 append-icon="fa-solid fa-arrow-right">
         </v-card>
@@ -28,7 +28,7 @@ const props = defineProps({
 
 
 const isLink = computed(() => {
-    return props.href != '' && props.to == undefined
+    return props.href != '' || props.to != undefined
 })
 
 </script>
diff --git a/vue3/src/components/display/DatabaseModelCol.vue b/vue3/src/components/display/DatabaseModelCol.vue
index 44d32ea72..407e5e8c5 100644
--- a/vue3/src/components/display/DatabaseModelCol.vue
+++ b/vue3/src/components/display/DatabaseModelCol.vue
@@ -1,6 +1,6 @@
 <template>
     <v-col cols="12" md="6" lg="4">
-        <v-card :prepend-icon="genericModel.model.icon" :title="$t(genericModel.model.localizationKey)" :subtitle="$t(genericModel.model.localizationKeyDescription)" variant="outlined" elevation="1"
+        <v-card :prepend-icon="genericModel.model.icon" :title="$t(genericModel.model.localizationKey)" :subtitle="$t(genericModel.model.localizationKeyDescription)"
                 :to="{name: 'ModelListPage', params: {model: genericModel.model.name}}"
                 append-icon="fa-solid fa-arrow-right">
         </v-card>
diff --git a/vue3/src/components/inputs/ModelSelect.vue b/vue3/src/components/inputs/ModelSelect.vue
index 270ab3cb1..6eea6eef9 100644
--- a/vue3/src/components/inputs/ModelSelect.vue
+++ b/vue3/src/components/inputs/ModelSelect.vue
@@ -48,13 +48,15 @@
             </template>
 
             <template #clear="{ clear }" v-if="props.canClear">
-            <span @click="clear" aria-hidden="true" tabindex="-1" role="button" data-clear="" aria-roledescription="❎" class="multiselect-clear">
-              <span class="multiselect-clear-icon"></span>
-            </span>
+                <span @click="clear" aria-hidden="true" tabindex="-1" role="button" data-clear="" aria-roledescription="❎" class="multiselect-clear">
+                  <span class="multiselect-clear-icon"></span>
+                </span>
             </template>
-            <template v-if="hasMoreItems" #afterlist>
-                <span class="text-disabled font-italic text-caption ms-3">{{$t('ModelSelectResultsHelp')}}</span>
+
+            <template v-if="hasMoreItems && !loading" #afterlist>
+                <span class="text-disabled font-italic text-caption ms-3">{{ $t('ModelSelectResultsHelp') }}</span>
             </template>
+
         </Multiselect>
 
         <template #append v-if="$slots.append">
@@ -146,7 +148,7 @@ function search(query: string) {
     loading.value = true
     return modelClass.value.list({query: query, page: 1, pageSize: props.limit}).then((r: any) => {
         if (modelClass.value.model.isPaginated) {
-            if(r.next){
+            if (r.next) {
                 hasMoreItems.value = true
             }
             return r.results
diff --git a/vue3/src/pages/ModelListPage.vue b/vue3/src/pages/ModelListPage.vue
index f98d0cfd8..39323ae64 100644
--- a/vue3/src/pages/ModelListPage.vue
+++ b/vue3/src/pages/ModelListPage.vue
@@ -32,7 +32,7 @@
         </v-row>
         <v-row>
             <v-col>
-                <v-text-field prepend-inner-icon="$search" :label="$t('Search')" v-model="searchQuery"></v-text-field>
+                <v-text-field prepend-inner-icon="$search" :label="$t('Search')" v-model="searchQuery" clearable></v-text-field>
                 <v-data-table-server
                     @update:options="loadItems"
                     :items="items"
@@ -57,7 +57,7 @@
                                     <v-list-item prepend-icon="fa-solid fa-arrows-to-dot" v-if="genericModel.model.isMerge" link>
                                         {{ $t('Merge') }}
                                         <model-merge-dialog :model="model" :source="item"
-                                                            @change="loadItems({page: tablePage, itemsPerPage: useUserPreferenceStore().deviceSettings.general_tableItemsPerPage})"></model-merge-dialog>
+                                                            @change="loadItems({page: tablePage, itemsPerPage: useUserPreferenceStore().deviceSettings.general_tableItemsPerPage, search: searchQuery})"></model-merge-dialog>
                                     </v-list-item>
                                     <v-list-item prepend-icon="fa-solid fa-table-list" :to="{name: 'IngredientEditorPage', query: {food_id: item.id}}"
                                                  v-if="genericModel.model.name == 'Food'">