From 8fe6cc9b9d374f1d639a1ea693312141ae885aef Mon Sep 17 00:00:00 2001
From: Thomas Sileo <t@a4.io>
Date: Tue, 30 Aug 2022 19:09:51 +0200
Subject: [PATCH] Fix the delete button

---
 app/static/common-admin.js | 4 +++-
 app/templates.py           | 4 ++--
 app/templates/layout.html  | 2 +-
 app/templates/utils.html   | 8 ++++----
 4 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/app/static/common-admin.js b/app/static/common-admin.js
index f8d5c63..10254cd 100644
--- a/app/static/common-admin.js
+++ b/app/static/common-admin.js
@@ -3,7 +3,9 @@ document.addEventListener('DOMContentLoaded', (ev) => {
   var forms = document.getElementsByClassName("object-delete-form")
   for (var i = 0; i < forms.length; i++) {
     forms[i].addEventListener('submit', (ev) => {
-      return confirm('Do you really want to delete this object?');
+      if (!confirm('Do you really want to delete this object?')) {
+        ev.preventDefault();
+      };
     });
   }
 });
diff --git a/app/templates.py b/app/templates.py
index 0b3b493..8ac8a2a 100644
--- a/app/templates.py
+++ b/app/templates.py
@@ -26,7 +26,6 @@ from app.actor import LOCAL_ACTOR
 from app.ap_object import Attachment
 from app.ap_object import Object
 from app.config import BASE_URL
-from app.config import CSS_HASH
 from app.config import CUSTOM_FOOTER
 from app.config import DEBUG
 from app.config import VERSION
@@ -105,7 +104,6 @@ async def render_template(
             "request": request,
             "debug": DEBUG,
             "microblogpub_version": VERSION,
-            "css_hash": CSS_HASH,
             "is_admin": is_admin,
             "csrf_token": generate_csrf_token(),
             "highlight_css": HIGHLIGHT_CSS,
@@ -419,3 +417,5 @@ _templates.env.filters["parse_datetime"] = _parse_datetime
 _templates.env.filters["poll_item_pct"] = _poll_item_pct
 _templates.env.filters["privacy_replace_url"] = privacy_replace.replace_url
 _templates.env.globals["JS_HASH"] = config.JS_HASH
+_templates.env.globals["CSS_HASH"] = config.CSS_HASH
+_templates.env.globals["BASE_URL"] = config.BASE_URL
diff --git a/app/templates/layout.html b/app/templates/layout.html
index c0c45f2..f2b8c64 100644
--- a/app/templates/layout.html
+++ b/app/templates/layout.html
@@ -4,7 +4,7 @@
 <meta charset="utf-8">
 <meta http-equiv="x-ua-compatible" content="ie=edge">
 <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
-<link rel="stylesheet" href="/static/css/main.css?v={{ css_hash }}">
+<link rel="stylesheet" href="/static/css/main.css?v={{ CSS_HASH }}">
 <link rel="alternate" title="{{ local_actor.display_name}}'s microblog" type="application/json" href="{{ url_for("json_feed") }}" />
 <link rel="alternate" href="{{ url_for("rss_feed") }}" type="application/rss+xml" title="{{ local_actor.display_name}}'s microblog">
 <link rel="alternate" href="{{ url_for("atom_feed") }}" type="application/atom+xml" title="{{ local_actor.display_name}}'s microblog">
diff --git a/app/templates/utils.html b/app/templates/utils.html
index f017bca..52c0c3f 100644
--- a/app/templates/utils.html
+++ b/app/templates/utils.html
@@ -96,11 +96,11 @@
 </form>
 {% endmacro %}
 
-{% macro admin_delete_button(ap_object_id) %}
+{% macro admin_delete_button(ap_object) %}
 <form action="{{ request.url_for("admin_actions_delete") }}" class="object-delete-form" method="POST">
     {{ embed_csrf_token() }}
-    {{ embed_redirect_url() }}
-    <input type="hidden" name="ap_object_id" value="{{ ap_object_id }}">
+    <input type="hidden" name="redirect_url" value="{% if request.url.path.endswith("/" + ap_object.public_id) %}{{ request.base_url}}{% else %}{{ request.url }}{% endif %}">
+    <input type="hidden" name="ap_object_id" value="{{ ap_object.ap_id }}">
     <input type="submit" value="delete">
 </form>
 {% endmacro %}
@@ -515,7 +515,7 @@
     <ul>
         {% if object.is_from_outbox %}
             <li>
-                {{ admin_delete_button(object.ap_id) }}
+                {{ admin_delete_button(object) }}
             </li>
 
             <li>