Docker/mealie
Docker/mealie
1
0
Fork 0
mirror of https://github.com/mealie-recipes/mealie.git synced 2025-08-04 04:55:21 +02:00
Code Issues Releases Activity

bug-fixes/category-tag-creator (#266)

Browse source 
* fix category labels

* set loader for migration

* v0.4.1

Co-authored-by: hay-kot <hay-kot@pm.me>
This commit is contained in:
Hayden 2021-04-07 17:20:19 -08:00 • committed by GitHub
parent 1cf95bb3b0
commit f09960f52c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 22 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

1
frontend/src/components/Admin/General/CreatePageDialog.vue
View file

@ -23,6 +23,7 @@
v-model="page.categories"
ref="categoryFormSelector"
@mounted="catMounted = true"
tag-selector="false"
/>
</v-card-text>

2
frontend/src/components/Admin/General/HomePageSettings.vue
View file

@ -84,7 +84,7 @@
</v-toolbar-title>
<v-spacer></v-spacer>
<NewCategoryTagDialog />
<NewCategoryTagDialog :tag-dialog="false" />
</v-app-bar>
<v-list height="300" dense style="overflow:auto">
<v-list-item-group>

12
frontend/src/components/Admin/Migration/MigrationCard.vue
View file

@ -40,7 +40,13 @@
<v-btn color="error" text @click="deleteMigration(migration.name)">
{{ $t("general.delete") }}
</v-btn>
<v-btn color="accent" text @click="importMigration(migration.name)">
<v-btn
color="accent"
text
@click="importMigration(migration.name)"
:loading="loading"
:disabled="loading"
>
{{ $t("general.import") }}
</v-btn>
</v-card-actions>
@ -82,10 +88,10 @@ export default {
this.$emit("refresh");
},
async importMigration(file_name) {
this.loading == true;
this.loading = true;
let response = await api.migrations.import(this.folder, file_name);
this.$emit("imported", response.successful, response.failed);
this.loading == false;
this.loading = false;
},
readableTime(timestamp) {
let date = new Date(timestamp);