mirrors/recipes
1
0
Fork 0
mirror of https://github.com/TandoorRecipes/recipes.git synced 2026-01-04 05:39:00 -05:00
Code Issues Packages Projects Releases Wiki Activity

small fixes

Browse Source
This commit is contained in:
vabene1111
2025-06-19 17:36:39 +02:00
parent d8f444e596
commit 5d65c76686
4 changed files with 13 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
vue3/src/components/display/DatabaseLinkCol.vue
View File

@@ -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>

2
vue3/src/components/display/DatabaseModelCol.vue
View File

@@ -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>

14
vue3/src/components/inputs/ModelSelect.vue
View File

@@ -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

4
vue3/src/pages/ModelListPage.vue
View File

@@ -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'">