From 58fc26904b5ad51c5dc2304e9a57b690839e182c Mon Sep 17 00:00:00 2001
From: vabene1111 <vabene1234@googlemail.com>
Date: Fri, 19 Mar 2021 10:05:17 +0100
Subject: [PATCH] fixed url importer stuff

---
 cookbook/helper/recipe_url_import.py |  2 +-
 cookbook/templates/url_import.html   | 19 ++++++++++++++++---
 2 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/cookbook/helper/recipe_url_import.py b/cookbook/helper/recipe_url_import.py
index f8f171e9..ab421e38 100644
--- a/cookbook/helper/recipe_url_import.py
+++ b/cookbook/helper/recipe_url_import.py
@@ -236,7 +236,6 @@ def get_from_scraper(scrape, space):
         recipe_json['prepTime'] = 0
         recipe_json['cookTime'] = 0
 
-    description += "\n\nImported from " + scrape.url
     recipe_json['description'] = description
 
     try:
@@ -315,6 +314,7 @@ def get_from_scraper(scrape, space):
     except AttributeError:
         recipe_json['recipeInstructions'] = ""
 
+    recipe_json['recipeInstructions'] += "\n\nImported from " + scrape.url
     return recipe_json
 
 
diff --git a/cookbook/templates/url_import.html b/cookbook/templates/url_import.html
index c2116008..64c4ec0e 100644
--- a/cookbook/templates/url_import.html
+++ b/cookbook/templates/url_import.html
@@ -63,7 +63,7 @@
                     <textarea id="id_description" class="form-control" v-model="recipe_data.description"
                               rows="4"></textarea>
                 </div>
-                
+
                 <div class="row">
                     <div class="col col-md-6" v-if="recipe_data.image !== ''">
                         <img v-bind:src="recipe_data.image" alt="{% trans 'Recipe Image' %}"
@@ -302,6 +302,7 @@
                 loading: false,
                 all_keywords: false,
                 importing_recipe: false,
+                json_data: '',
             },
             directives: {
                 tabindex: {
@@ -338,7 +339,13 @@
                         this.error = err.data
                         this.loading = false
                         console.log(err)
-                        this.makeToast(gettext('Error'), gettext('There was an error loading a resource!') + err.bodyText, 'danger')
+                        let msg = gettext('There was an error loading a resource!')
+                        if (err.bodyText.length < 300) {
+                            msg += err.bodyText
+                        } else {
+                            msg += ' ' + err.status + ' ' + err.statusText
+                        }
+                        this.makeToast(gettext('Error'), msg, 'danger')
                     })
                 },
                 loadRecipeJson: function () {
@@ -353,7 +360,13 @@
                         this.error = err.data
                         this.loading = false
                         console.log(err)
-                        this.makeToast(gettext('Error'), gettext('There was an error loading a resource!') + err.bodyText, 'danger')
+                        let msg = gettext('There was an error loading a resource!')
+                        if (err.bodyText.length < 300) {
+                            msg += err.bodyText
+                        } else {
+                            msg += ' ' + err.status + ' ' + err.statusText
+                        }
+                        this.makeToast(gettext('Error'), msg, 'danger')
                     })
                 },
                 importRecipe: function () {