cgiacofei/TandoorRecipes
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Move/Merge updated to handle object vs id

Browse Source
This commit is contained in:
smilerz
2021-09-08 09:16:58 -05:00
parent 04c047bd31
commit 5f37af5710
6 changed files with 68 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

94
cookbook/static/vue/js/chunk-vendors.js
View File

File diff suppressed because one or more lines are too long

2
cookbook/static/vue/js/model_list_view.js
View File

File diff suppressed because one or more lines are too long

2
cookbook/static/vue/js/recipe_search_view.js
View File

File diff suppressed because one or more lines are too long

2
cookbook/templates/sw.js
View File

File diff suppressed because one or more lines are too long

9
vue/src/apps/ModelListView/ModelListView.vue
View File

@ -48,6 +48,11 @@
<template v-slot:upper-right> <template v-slot:upper-right>
<b-button v-if="i.recipe" v-b-tooltip.hover :title="i.recipe.name" <b-button v-if="i.recipe" v-b-tooltip.hover :title="i.recipe.name"
class=" btn fas fa-book-open p-0 border-0" variant="link" :href="i.recipe.url"/> class=" btn fas fa-book-open p-0 border-0" variant="link" :href="i.recipe.url"/>
<!-- keywords can have icons - if it exists, display it -->
<b-button v-if="i.icon"
class=" btn p-0 border-0" variant="link">
{{i.icon}}
</b-button>
</template> </template>
</generic-horizontal-card> </generic-horizontal-card>
</template> </template>
@ -177,10 +182,10 @@ export default {
this.saveThis(update) this.saveThis(update)
break; break;
case this.Actions.MERGE: case this.Actions.MERGE:
this.mergeThis(this.this_item.id, e.form_data.target) this.mergeThis(this.this_item.id, e.form_data.target.id)
break; break;
case this.Actions.MOVE: case this.Actions.MOVE:
this.moveThis(this.this_item.id, e.form_data.target) this.moveThis(this.this_item.id, e.form_data.target.id)
break; break;
} }
} }

22
vue/webpack-stats.json
View File

@ -3,47 +3,47 @@
"assets": { "assets": {
"../../templates/sw.js": { "../../templates/sw.js": {
"name": "../../templates/sw.js", "name": "../../templates/sw.js",
"path": "..\\..\\templates\\sw.js" "path": "../../templates/sw.js"
}, },
"css/chunk-vendors.css": { "css/chunk-vendors.css": {
"name": "css/chunk-vendors.css", "name": "css/chunk-vendors.css",
"path": "css\\chunk-vendors.css" "path": "css/chunk-vendors.css"
}, },
"js/chunk-vendors.js": { "js/chunk-vendors.js": {
"name": "js/chunk-vendors.js", "name": "js/chunk-vendors.js",
"path": "js\\chunk-vendors.js" "path": "js/chunk-vendors.js"
}, },
"js/import_response_view.js": { "js/import_response_view.js": {
"name": "js/import_response_view.js", "name": "js/import_response_view.js",
"path": "js\\import_response_view.js" "path": "js/import_response_view.js"
}, },
"css/model_list_view.css": { "css/model_list_view.css": {
"name": "css/model_list_view.css", "name": "css/model_list_view.css",
"path": "css\\model_list_view.css" "path": "css/model_list_view.css"
}, },
"js/model_list_view.js": { "js/model_list_view.js": {
"name": "js/model_list_view.js", "name": "js/model_list_view.js",
"path": "js\\model_list_view.js" "path": "js/model_list_view.js"
}, },
"js/offline_view.js": { "js/offline_view.js": {
"name": "js/offline_view.js", "name": "js/offline_view.js",
"path": "js\\offline_view.js" "path": "js/offline_view.js"
}, },
"js/recipe_search_view.js": { "js/recipe_search_view.js": {
"name": "js/recipe_search_view.js", "name": "js/recipe_search_view.js",
"path": "js\\recipe_search_view.js" "path": "js/recipe_search_view.js"
}, },
"js/recipe_view.js": { "js/recipe_view.js": {
"name": "js/recipe_view.js", "name": "js/recipe_view.js",
"path": "js\\recipe_view.js" "path": "js/recipe_view.js"
}, },
"js/supermarket_view.js": { "js/supermarket_view.js": {
"name": "js/supermarket_view.js", "name": "js/supermarket_view.js",
"path": "js\\supermarket_view.js" "path": "js/supermarket_view.js"
}, },
"js/user_file_view.js": { "js/user_file_view.js": {
"name": "js/user_file_view.js", "name": "js/user_file_view.js",
"path": "js\\user_file_view.js" "path": "js/user_file_view.js"
}, },
"recipe_search_view.html": { "recipe_search_view.html": {
"name": "recipe_search_view.html", "name": "recipe_search_view.html",