diff --git a/.github/workflows/docker-publish-latest.yml b/.github/workflows/docker-publish-latest.yml index 07ab1869..e48bb307 100644 --- a/.github/workflows/docker-publish-latest.yml +++ b/.github/workflows/docker-publish-latest.yml @@ -38,6 +38,7 @@ jobs: with: publish: true imageName: vabene1111/recipes + platform: linux/amd64,linux/arm64 tag: latest dockerUser: ${{ secrets.DOCKER_USERNAME }} dockerPassword: ${{ secrets.DOCKER_PASSWORD }} diff --git a/.github/workflows/docker-publish-release.yml b/.github/workflows/docker-publish-release.yml index 636ed576..1b79b34d 100644 --- a/.github/workflows/docker-publish-release.yml +++ b/.github/workflows/docker-publish-release.yml @@ -40,6 +40,7 @@ jobs: with: publish: true imageName: vabene1111/recipes + platform: linux/amd64,linux/arm64 tag: ${{ steps.get_version.outputs.VERSION }} dockerUser: ${{ secrets.DOCKER_USERNAME }} dockerPassword: ${{ secrets.DOCKER_PASSWORD }} diff --git a/vue/src/apps/ShoppingListView/ShoppingListView.vue b/vue/src/apps/ShoppingListView/ShoppingListView.vue index a08e8ca5..eca16af6 100644 --- a/vue/src/apps/ShoppingListView/ShoppingListView.vue +++ b/vue/src/apps/ShoppingListView/ShoppingListView.vue @@ -291,7 +291,10 @@ aria-hidden="true"> - {{ supermarket.description }} + {{ + supermarket.description + }} @@ -1026,20 +1029,23 @@ export default { "settings.shopping_auto_sync": function (newVal, oldVal) { clearInterval(this.autosync_id) this.autosync_id = undefined - if (!newVal) { - window.removeEventListener("online", this.updateOnlineStatus) - window.removeEventListener("offline", this.updateOnlineStatus) - return - } else if (oldVal === 0 && newVal > 0) { - window.addEventListener("online", this.updateOnlineStatus) - window.addEventListener("offline", this.updateOnlineStatus) - } - this.autosync_id = setInterval(() => { - if (this.online && !this.auto_sync_running) { - this.auto_sync_running = true - this.getShoppingList(true) + if (this.settings.shopping_auto_sync > 0) { + if (!newVal) { + window.removeEventListener("online", this.updateOnlineStatus) + window.removeEventListener("offline", this.updateOnlineStatus) + return + } else if (oldVal === 0 && newVal > 0) { + window.addEventListener("online", this.updateOnlineStatus) + window.addEventListener("offline", this.updateOnlineStatus) } - }, this.settings.shopping_auto_sync * 1000) + this.autosync_id = setInterval(() => { + if (this.online && !this.auto_sync_running) { + this.auto_sync_running = true + this.getShoppingList(true) + } + }, this.settings.shopping_auto_sync * 1000) + } + }, "settings.default_delay": function (newVal, oldVal) { this.delay = Number(newVal) @@ -1446,6 +1452,7 @@ export default { if (supermarket.editing) { this.$set(this.supermarkets[index], "editing", false) + this.$set(this.supermarkets[index], "category_to_supermarket", this.editing_supermarket_categories) this.editing_supermarket_categories = [] let apiClient = new ApiApiFactory() @@ -1618,8 +1625,7 @@ export default { this.editing_supermarket_categories.forEach((element, index) => { let apiClient = new ApiApiFactory() - - promises.push(apiClient.partialUpdateSupermarketCategoryRelation(element.relation_id, {order: element.order})) + promises.push(apiClient.partialUpdateSupermarketCategoryRelation(element.relation_id, {order: index})) }) return Promise.all(promises).then(() => { diff --git a/vue/yarn.lock b/vue/yarn.lock index 371d69f4..bf4fc6a6 100644 --- a/vue/yarn.lock +++ b/vue/yarn.lock @@ -12697,11 +12697,6 @@ vue-infinite-loading@^2.4.5: resolved "https://registry.yarnpkg.com/vue-infinite-loading/-/vue-infinite-loading-2.4.5.tgz#cc20fd40af7f20188006443c99b60470cf1de1b3" integrity sha512-xhq95Mxun060bRnsOoLE2Be6BR7jYwuC89kDe18+GmCLVrRA/dU0jrGb12Xu6NjmKs+iTW0AA6saSEmEW4cR7g== -vue-jstree@^2.1.6: - version "2.1.6" - resolved "https://registry.yarnpkg.com/vue-jstree/-/vue-jstree-2.1.6.tgz#44827ad72953ed77da6590ce4e8f37f7787f8653" - integrity sha512-vtUmhLbfE2JvcnYNRXauJPkNJSRO/f9BTsbxV+ESXP/mMQPVUIYI4EkSHKSEOxVDHTU7SfLp/AxplmaAl6ctcg== - "vue-loader-v16@npm:vue-loader@^16.1.0": version "16.8.3" resolved "https://registry.yarnpkg.com/vue-loader/-/vue-loader-16.8.3.tgz#d43e675def5ba9345d6c7f05914c13d861997087"