Merge branch 'develop'

TandoorRecipes · May 4, 2022 · b66a5c1 · b66a5c1
2 parents 8f5b017 + bfc4263
commit b66a5c1
Show file tree

Hide file tree

Showing 5 changed files with 35 additions and 24 deletions.
diff --git a/cookbook/helper/recipe_url_import.py b/cookbook/helper/recipe_url_import.py
@@ -114,7 +114,7 @@ def get_from_scraper(scrape, request):
         except Exception:
             pass
 
-    if source_url := scrape.canonical_url():
+    if source_url := scrape.url:
         recipe_json['source_url'] = source_url
         try:
             keywords.append(source_url.replace('http://', '').replace('https://', '').split('/')[0])

diff --git a/requirements.txt b/requirements.txt
@@ -1,5 +1,5 @@
 Django==3.2.13
-cryptography==36.0.2
+cryptography==37.0.1
 django-annoying==0.10.6
 django-autocomplete-light==3.9.4
 django-cleanup==6.0.0

diff --git a/vue/src/apps/ShoppingListView/ShoppingListView.vue b/vue/src/apps/ShoppingListView/ShoppingListView.vue
@@ -291,7 +291,10 @@
                                                                         aria-hidden="true"></i
                                                                     ></span>
                                                                 </h5>
-                                                                 <span class="text-muted" v-if="supermarket.description !== ''">{{ supermarket.description }}</span>
+                                                                <span class="text-muted"
+                                                                      v-if="supermarket.description !== ''">{{
+                                                                        supermarket.description
+                                                                    }}</span>
                                                             </b-col>
                                                         </b-row>
                                                     </b-card-header>
@@ -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)
@@ -1618,8 +1624,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/src/locales/pl.json b/vue/src/locales/pl.json
@@ -383,5 +383,16 @@
     "additional_options": "Opcje dodatkowe",
     "err_deleting_protected_resource": "Obiekt, który próbujesz usunąć, jest nadal używany i nie można go usunąć.",
     "Protected": "Chroniony",
-    "Ingredient Editor": "Edytor składników"
+    "Ingredient Editor": "Edytor składników",
+    "one_url_per_line": "Jeden URL na linię",
+    "Website": "Strona internetowa",
+    "App": "Aplikacja",
+    "Bookmarklet": "Skryptozakładka",
+    "click_image_import": "Kliknij obraz, który chcesz zaimportować do tego przepisu",
+    "no_more_images_found": "Nie znaleziono dodatkowych zdjęć na stronie internetowej.",
+    "import_duplicates": "Aby zapobiec duplikatom przepisy tej samej nazwie, co istniejące, są ignorowane. Zaznacz to pole, aby zaimportować wszystko.",
+    "paste_json": "Wklej tutaj źródło json lub html, aby załadować przepis.",
+    "Click_To_Edit": "Kliknij aby edytować",
+    "Imported_From": "Zaimportowane z",
+    "Options": "Opcje"
 }
diff --git 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"