From 4d657f4ff9ae7fbfc2bf634db0cfc664817234a3 Mon Sep 17 00:00:00 2001 From: Michael Tremer Date: Thu, 27 Jul 2023 08:42:45 +0000 Subject: [PATCH] blog: Refactor writing posts Signed-off-by: Michael Tremer --- Makefile.am | 2 +- src/backend/blog.py | 16 ++++++- src/templates/blog/compose.html | 43 ----------------- src/templates/blog/drafts.html | 2 +- src/templates/blog/post.html | 9 ++++ src/templates/blog/write.html | 83 +++++++++++++++++++++++++++++++++ src/web/__init__.py | 2 +- src/web/blog.py | 20 ++++---- 8 files changed, 117 insertions(+), 60 deletions(-) delete mode 100644 src/templates/blog/compose.html create mode 100644 src/templates/blog/write.html diff --git a/Makefile.am b/Makefile.am index 3268135c..3c9f6d03 100644 --- a/Makefile.am +++ b/Makefile.am @@ -145,7 +145,6 @@ templates_auth_modules_DATA = \ templates_auth_modulesdir = $(templates_authdir)/modules templates_blog_DATA = \ - src/templates/blog/compose.html \ src/templates/blog/delete.html \ src/templates/blog/drafts.html \ src/templates/blog/feed.xml \ @@ -153,6 +152,7 @@ templates_blog_DATA = \ src/templates/blog/post.html \ src/templates/blog/publish.html \ src/templates/blog/tag.html \ + src/templates/blog/write.html \ src/templates/blog/year.html templates_blogdir = $(templatesdir)/blog diff --git a/src/backend/blog.py b/src/backend/blog.py index 43f3706f..67598069 100644 --- a/src/backend/blog.py +++ b/src/backend/blog.py @@ -378,9 +378,21 @@ class Post(misc.Object): return self.backend.releases._get_release("SELECT * FROM releases \ WHERE published IS NOT NULL AND published <= NOW() AND blog_id = %s", self.id) - def is_editable(self, editor): + def is_editable(self, user): + # Anonymous users cannot do anything + if not user: + return False + + # Admins can edit anything + if user.is_admin(): + return True + + # User must have permission for the blog + if not user.is_blog_author(): + return False + # Authors can edit their own posts - return self.author == editor + return self.author == user def update(self, title, text, tags=[]): """ diff --git a/src/templates/blog/compose.html b/src/templates/blog/compose.html deleted file mode 100644 index 686e3f6f..00000000 --- a/src/templates/blog/compose.html +++ /dev/null @@ -1,43 +0,0 @@ -{% extends "../base.html" %} - -{% block title %}{% if post %}{{ _("Edit %s") % post.title }}{% else %}{{ _("Compose A New Article") }}{% end %}{% end block %} - -{% block main %} -
-
-
- {% raw xsrf_form_html() %} - -
- -
- -
- -
- -
- -
- -
-
- -
- - - {% if post %} - - {{ _("Delete") }} - - {% end %} -
-
-
-
-{% end block %} diff --git a/src/templates/blog/drafts.html b/src/templates/blog/drafts.html index 4f60db69..0513ea63 100644 --- a/src/templates/blog/drafts.html +++ b/src/templates/blog/drafts.html @@ -36,7 +36,7 @@ {% end %}
- + {{ _("Write a New Post") }}
diff --git a/src/templates/blog/post.html b/src/templates/blog/post.html index cbc6bbab..a2f9883a 100644 --- a/src/templates/blog/post.html +++ b/src/templates/blog/post.html @@ -119,6 +119,15 @@ {% end %} + + {% if post.is_editable(current_user) %} + + + + + {{ _("Edit") }} + + {% end %}
diff --git a/src/templates/blog/write.html b/src/templates/blog/write.html new file mode 100644 index 00000000..ad6eb6d6 --- /dev/null +++ b/src/templates/blog/write.html @@ -0,0 +1,83 @@ +{% extends "../base.html" %} + +{% block title %} + {% if post %} + {{ _("Edit %s") % post.title }} + {% else %} + {{ _("Write A New Post") }} + {% end %} +{% end block %} + +{% block container %} +
+
+
+ + +

{{ _("Write a New Post") }}

+
+
+
+ +
+
+
+
+
+ {% raw xsrf_form_html() %} + +
+
+ +
+
+ +
+
+ +
+
+ +
+ +
+ +
+
+ +
+
+ +
+ + {% if post %} +
+ + {{ _("Delete") }} + +
+ {% end %} +
+
+
+
+
+
+{% end block %} diff --git a/src/web/__init__.py b/src/web/__init__.py index 848abae6..9096810e 100644 --- a/src/web/__init__.py +++ b/src/web/__init__.py @@ -126,10 +126,10 @@ class Application(tornado.web.Application): # Blog (r"/blog", blog.IndexHandler), - (r"/blog/compose", blog.ComposeHandler), (r"/blog/drafts", blog.DraftsHandler), (r"/blog/feed.xml", blog.FeedHandler), (r"/blog/tags/([0-9a-z\-\.]+)", blog.TagHandler), + (r"/blog/write", blog.WriteHandler), (r"/blog/years/([0-9]{4})", blog.YearHandler), (r"/blog/([0-9a-z\-\._]+)", blog.PostHandler), (r"/blog/([0-9a-z\-\._]+)/delete", blog.DeleteHandler), diff --git a/src/web/blog.py b/src/web/blog.py index 92099d5d..e4a41a1a 100644 --- a/src/web/blog.py +++ b/src/web/blog.py @@ -145,7 +145,7 @@ class YearHandler(base.BaseHandler): self.render("blog/year.html", posts=posts, year=year) -class ComposeHandler(base.BaseHandler): +class WriteHandler(base.BaseHandler): @tornado.web.authenticated def prepare(self): # Check if the user has permissions @@ -154,7 +154,7 @@ class ComposeHandler(base.BaseHandler): @tornado.web.authenticated def get(self): - self.render("blog/compose.html", post=None) + self.render("blog/write.html", post=None) @tornado.web.authenticated def post(self): @@ -166,7 +166,8 @@ class ComposeHandler(base.BaseHandler): post = self.backend.blog.create_post(title, text, author=self.current_user, tags=tags) - self.redirect("/drafts") + # Redirect to the new post + self.redirect("/blog/%s" % post.slug) class EditHandler(base.BaseHandler): @@ -180,13 +181,13 @@ class EditHandler(base.BaseHandler): if not post.is_editable(self.current_user): raise tornado.web.HTTPError(403, "%s cannot edit %s" % (self.current_user, post)) - self.render("blog/compose.html", post=post) + self.render("blog/write.html", post=post) @tornado.web.authenticated def post(self, slug): post = self.backend.blog.get_by_slug(slug, published=False) if not post: - raise tornado.web.HTTPError(404) + raise tornado.web.HTTPError(404, "Could not find post %s" % slug) # Check if post is editable if not post.is_editable(self.current_user): @@ -200,13 +201,8 @@ class EditHandler(base.BaseHandler): tags = self.get_argument("tags", "").split(" "), ) - # Return to blog if the post is already published - if post.is_published(): - self.redirect("/post/%s" % post.slug) - return - - # Otherwise return to drafts - self.redirect("/drafts") + # Redirect to the post + self.redirect("/blog/%s" % post.slug) class DeleteHandler(base.BaseHandler): -- 2.47.3