zaklaus
/
microblog
1
0
Fork 0
Code Issues Pull Requests Releases Activity

Fix the delete button

main
Thomas Sileo 2022-08-30 19:09:51 +02:00
parent 4cb499e44d
commit 8fe6cc9b9d
4 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/static/common-admin.js
View File

@ -3,7 +3,9 @@ document.addEventListener('DOMContentLoaded', (ev) => {
var forms = document.getElementsByClassName("object-delete-form") var forms = document.getElementsByClassName("object-delete-form")
for (var i = 0; i < forms.length; i++) { for (var i = 0; i < forms.length; i++) {
forms[i].addEventListener('submit', (ev) => { 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();
};
}); });
} }
}); });

4
app/templates.py
View File

@ -26,7 +26,6 @@ from app.actor import LOCAL_ACTOR
from app.ap_object import Attachment from app.ap_object import Attachment
from app.ap_object import Object from app.ap_object import Object
from app.config import BASE_URL from app.config import BASE_URL
from app.config import CSS_HASH
from app.config import CUSTOM_FOOTER from app.config import CUSTOM_FOOTER
from app.config import DEBUG from app.config import DEBUG
from app.config import VERSION from app.config import VERSION
@ -105,7 +104,6 @@ async def render_template(
"request": request, "request": request,
"debug": DEBUG, "debug": DEBUG,
"microblogpub_version": VERSION, "microblogpub_version": VERSION,
"css_hash": CSS_HASH,
"is_admin": is_admin, "is_admin": is_admin,
"csrf_token": generate_csrf_token(), "csrf_token": generate_csrf_token(),
"highlight_css": HIGHLIGHT_CSS, "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["poll_item_pct"] = _poll_item_pct
_templates.env.filters["privacy_replace_url"] = privacy_replace.replace_url _templates.env.filters["privacy_replace_url"] = privacy_replace.replace_url
_templates.env.globals["JS_HASH"] = config.JS_HASH _templates.env.globals["JS_HASH"] = config.JS_HASH
_templates.env.globals["CSS_HASH"] = config.CSS_HASH
_templates.env.globals["BASE_URL"] = config.BASE_URL

2
app/templates/layout.html
View File

@ -4,7 +4,7 @@
<meta charset="utf-8"> <meta charset="utf-8">
<meta http-equiv="x-ua-compatible" content="ie=edge"> <meta http-equiv="x-ua-compatible" content="ie=edge">
<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no"> <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" 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("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"> <link rel="alternate" href="{{ url_for("atom_feed") }}" type="application/atom+xml" title="{{ local_actor.display_name}}'s microblog">

8
app/templates/utils.html
View File

@ -96,11 +96,11 @@
</form> </form>
{% endmacro %} {% 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"> <form action="{{ request.url_for("admin_actions_delete") }}" class="object-delete-form" method="POST">
{{ embed_csrf_token() }} {{ embed_csrf_token() }}
{{ embed_redirect_url() }} <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_id }}"> <input type="hidden" name="ap_object_id" value="{{ ap_object.ap_id }}">
<input type="submit" value="delete"> <input type="submit" value="delete">
</form> </form>
{% endmacro %} {% endmacro %}
@ -515,7 +515,7 @@
<ul> <ul>
{% if object.is_from_outbox %} {% if object.is_from_outbox %}
<li> <li>
{{ admin_delete_button(object.ap_id) }} {{ admin_delete_button(object) }}
</li> </li>
<li> <li>