Conditionally append slashes to chosen URLs to avoid invisible redirects

torchbox · Jul 29, 2024 · 35e4157 · 35e4157
1 parent 89be14e
commit 35e4157
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 0 deletions.
diff --git a/src/wagtail_bynder/static/wagtailadmin/js/chooser-modal-handler-factory.js b/src/wagtail_bynder/static/wagtailadmin/js/chooser-modal-handler-factory.js
@@ -9,6 +9,7 @@ class BynderChooserModalOnloadHandlerFactory {
     this.assetType = opts?.assetType || null;
     this.chosenMultipleUrl = opts?.chosenMultipleUrl || "/";
     this.chosenSingleUrl = opts?.chosenSingleUrl || "/";
+    this.chosenUrlAppendSlash = window.chosenUrlappendSlash || true;
   }
 
   onLoadChooseStep(modal) {
@@ -49,6 +50,9 @@ class BynderChooserModalOnloadHandlerFactory {
         }
         else {
           url = chosenSingleUrl + assets[0].databaseId;
+          if (chosenUrlAppendSlash) {
+            url += "/";
+          }
         }
         modal.loadUrl(url, params);
         return false;

diff --git a/src/wagtail_bynder/templates/wagtailadmin/admin_base.html b/src/wagtail_bynder/templates/wagtailadmin/admin_base.html
@@ -6,6 +6,7 @@
     <script>
         window.bynderAPIToken = '{% bynder_compactview_api_token %}';
         window.bynderDomain = '{% bynder_domain %}';
+        window.chosenUrlAppendSlash = {% get_append_slash %};
         window.imageChosenBaseUrl = "{% get_image_chosen_base_url %}";
         window.documentChosenBaseUrl = "{% get_document_chosen_base_url %}";
         window.videoChosenBaseUrl = "{% get_video_chosen_base_url %}";

diff --git a/src/wagtail_bynder/templatetags/bynder_tags.py b/src/wagtail_bynder/templatetags/bynder_tags.py
@@ -43,3 +43,8 @@ def get_video_chosen_base_url():
             url += "/"
         return url
     return ""
+
+
+@register.simple_tag
+def get_append_slash():
+    return str(bool(settings.APPEND_SLASH)).lower()