Refactoring @778a0a code to match new template structure and now we h…

…ave first version of #11 post editing.
tinyBlogPub · Sep 6, 2024 · 20617d9 · 20617d9
1 parent 05cbf78
commit 20617d9
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 8 deletions.
diff --git a/app/admin.py b/app/admin.py
@@ -1231,8 +1231,7 @@ async def admin_edit_text(
     maybe_object = (
         (
             await db_session.execute(
-                select(models.OutboxObject)
-                .where(
+                select(models.OutboxObject).where(
                     models.OutboxObject.public_id == public_id,
                     models.OutboxObject.is_deleted.is_(False),
                 )
@@ -1271,8 +1270,7 @@ async def admin_actions_edit_text(
     maybe_object = (
         (
             await db_session.execute(
-                select(models.OutboxObject)
-                .where(
+                select(models.OutboxObject).where(
                     models.OutboxObject.public_id == public_id,
                     models.OutboxObject.is_deleted.is_(False),
                 )
@@ -1297,7 +1295,6 @@ async def admin_actions_edit_text(
     )
 
 
-
 @router.post("/actions/vote", response_model=None)
 async def admin_actions_vote(
     request: Request,

diff --git a/app/templates/admin_edit_text.html b/app/templates/admin_edit_text.html
@@ -1,4 +1,5 @@
 {%- import "utils.html" as utils with context -%}
+{%- import "components/hidden_inputs.html" as hidden_inputs -%}
 {% extends "layout.html" %}
 
 {% block head %}
@@ -10,8 +11,8 @@
 <div class="box">
 
 <form class="form admin-new" action="{{ request.url_for("admin_actions_edit_text", public_id=public_id) }}" enctype="multipart/form-data" method="POST">
-    {{ utils.embed_csrf_token() }}
-    {{ utils.embed_redirect_url() }}
+    {{ hidden_inputs.embed_csrf_token(csrf_token) }}
+    {{ hidden_inputs.embed_redirect_url(request) }}
 
     {% if outbox_object.ap_type == "Article" %}
     <p>

diff --git a/app/templates/components/admin_buttons.html b/app/templates/components/admin_buttons.html
@@ -108,6 +108,13 @@
 </form>
 {% endmacro %}
 
+{% macro admin_edit_button(request, csrf_token, ap_object) %}
+<form action="{{ request.url_for("admin_edit_text", public_id=ap_object.public_id) }}" class="object-edit-form" method="GET">
+    {{ hidden_inputs.embed_csrf_token(csrf_token) }}
+    <input type="submit" value="edit">
+</form>
+{% endmacro %}
+
 {% macro admin_delete_button(request, csrf_token, ap_object) %}
 <form action="{{ request.url_for("admin_actions_delete") }}" class="object-delete-form" method="POST">
     {{ hidden_inputs.embed_csrf_token(csrf_token) }}

diff --git a/app/templates/utils.html b/app/templates/utils.html
@@ -270,7 +270,7 @@ <h3>Location</h3>
     <ul>
         {% if object.is_from_outbox %}
             <li>
-                {{ admin_edit_button(object) }}
+                {{ admin_buttons.admin_edit_button(request, csrf_token, object) }}
             </li>
             <li>
                 {{ admin_buttons.admin_delete_button(request, csrf_token, object) }}