From 9d0a6e63f8d0be0e59c61e7a3f17b53ae3362875 Mon Sep 17 00:00:00 2001
From: vabene1111 <vabene1234@googlemail.com>
Date: Wed, 25 Dec 2019 19:47:11 +0100
Subject: [PATCH] fixed not beeing able to open external recipes when internal
 exists

---
 .../templates/include/recipe_open_modal.html  | 11 +++++++----
 cookbook/templates/recipe_view.html           |  2 +-
 cookbook/urls.py                              |  3 +++
 cookbook/views/api.py                         | 19 +++++++++++++++++--
 4 files changed, 28 insertions(+), 7 deletions(-)

diff --git a/cookbook/templates/include/recipe_open_modal.html b/cookbook/templates/include/recipe_open_modal.html
index d8f4a10a5..c377bbbb3 100644
--- a/cookbook/templates/include/recipe_open_modal.html
+++ b/cookbook/templates/include/recipe_open_modal.html
@@ -43,12 +43,15 @@
 </div>
 
 <script type="text/javascript">
-    function openRecipe(id) {
+    function openRecipe(id, force_external = false) {
         var link = $('#a_recipe_open');
         link.hide();
-         $('#div_loader').show();
+        $('#div_loader').show();
 
         var url = "{% url 'api_get_file_link' recipe_id=12345 %}".replace(/12345/, id);
+        if (force_external) {
+            url = "{% url 'api_get_external_file_link' recipe_id=12345 %}".replace(/12345/, id);
+        }
 
         link.text("{% trans 'Open Recipe' %}");
         $('#modal_recipe').modal('show');
@@ -56,10 +59,10 @@
         var xhttp = new XMLHttpRequest();
         xhttp.onreadystatechange = function () {
             if (this.readyState === 4 && this.status === 200) {
-                if ( /^((?!chrome|android).)*safari/i.test(navigator.userAgent)){
+                if (/^((?!chrome|android).)*safari/i.test(navigator.userAgent)) {
                     link.attr("href", this.responseText);
                     link.show();
-                }else{
+                } else {
                     window.open(this.responseText);
                     $('#modal_recipe').modal('hide');
                 }
diff --git a/cookbook/templates/recipe_view.html b/cookbook/templates/recipe_view.html
index c749c40eb..642c8c306 100644
--- a/cookbook/templates/recipe_view.html
+++ b/cookbook/templates/recipe_view.html
@@ -110,7 +110,7 @@
     {% endif %}
 
     {% if recipe.storage %}
-        <a href='#' onClick='openRecipe({{ recipe.id }})'>{% trans 'View external recipe' %} <i
+        <a href='#' onClick='openRecipe({{ recipe.id }}, true)'>{% trans 'View external recipe' %} <i
                 class="fas fa-external-link-alt"></i></a>
     {% endif %}
 
diff --git a/cookbook/urls.py b/cookbook/urls.py
index 3d91d6217..94ffc447a 100644
--- a/cookbook/urls.py
+++ b/cookbook/urls.py
@@ -54,6 +54,9 @@ urlpatterns = [
     path('data/statistics', data.statistics, name='data_stats'),
 
     path('api/get_file_link/<int:recipe_id>/', api.get_file_link, name='api_get_file_link'),
+    path('api/get_external_file_link/<int:recipe_id>/', api.get_external_file_link, name='api_get_external_file_link'),
+
+
     path('api/sync_all/', api.sync_all, name='api_sync'),
 
     path('dal/keyword/', dal.KeywordAutocomplete.as_view(), name='dal_keyword'),
diff --git a/cookbook/views/api.py b/cookbook/views/api.py
index 9104f7e6c..41df185f5 100644
--- a/cookbook/views/api.py
+++ b/cookbook/views/api.py
@@ -6,7 +6,6 @@ from django.contrib.auth.decorators import login_required
 from django.shortcuts import redirect
 
 from cookbook.models import Recipe, Sync, Storage
-from cookbook.provider import dropbox
 from cookbook.provider.dropbox import Dropbox
 from cookbook.provider.nextcloud import Nextcloud
 
@@ -17,7 +16,23 @@ def get_file_link(request, recipe_id):
 
     if recipe.internal:
         return HttpResponse(reverse('view_recipe', args=[recipe_id]))
-    if recipe.storage.method == Storage.DROPBOX:
+    if recipe.storage.method == Storage.DROPBOX: # TODO move to central location (as all provider related functions)
+        if recipe.link == "":
+            recipe.link = Dropbox.get_share_link(recipe)  # TODO response validation
+            recipe.save()
+    if recipe.storage.method == Storage.NEXTCLOUD:
+        if recipe.link == "":
+            recipe.link = Nextcloud.get_share_link(recipe)  # TODO response validation
+            recipe.save()
+
+    return HttpResponse(recipe.link)
+
+
+@login_required
+def get_external_file_link(request, recipe_id):
+    recipe = Recipe.objects.get(id=recipe_id)
+
+    if recipe.storage.method == Storage.DROPBOX: # TODO move to central location (as all provider related functions)
         if recipe.link == "":
             recipe.link = Dropbox.get_share_link(recipe)  # TODO response validation
             recipe.save()