From df01767ec75f452729eb5da24dc3b543bcbfff68 Mon Sep 17 00:00:00 2001 From: Michael Tremer Date: Mon, 12 Nov 2018 20:49:53 +0000 Subject: [PATCH] wiki: Simplify code when saving a page Signed-off-by: Michael Tremer --- src/backend/wiki.py | 2 +- src/web/wiki.py | 16 +++++----------- 2 files changed, 6 insertions(+), 12 deletions(-) diff --git a/src/backend/wiki.py b/src/backend/wiki.py index 493837cc..5a285ea8 100644 --- a/src/backend/wiki.py +++ b/src/backend/wiki.py @@ -60,7 +60,7 @@ class Wiki(misc.Object): page = Page.sanitise_page_name(page) return self._get_page("INSERT INTO wiki(page, author_uid, markdown, changes, address) \ - VALUES(%s, %s, %s, %s, %s) RETURNING *", page, author.uid, content, changes, address) + VALUES(%s, %s, %s, %s, %s) RETURNING *", page, author.uid, content or None, changes, address) def delete_page(self, page, author, **kwargs): # Do nothing if the page does not exist diff --git a/src/web/wiki.py b/src/web/wiki.py index b3b409c1..a62304ca 100644 --- a/src/web/wiki.py +++ b/src/web/wiki.py @@ -51,22 +51,16 @@ class PageHandler(auth.CacheMixin, base.BaseHandler): content = self.get_argument("content", None) changes = self.get_argument("changes") - # Delete the page if content is empty - if not content: - with self.db.transaction(): - self.backend.wiki.delete_page(page, self.current_user, - changes=changes, address=self.get_remote_ip()) - - self.redirect("/") - return - # Create a new page in the database with self.db.transaction(): page = self.backend.wiki.create_page(page, self.current_user, content, changes=changes, address=self.get_remote_ip()) - # Redirect - self.redirect(page.url) + # Redirect back + if page.was_deleted(): + self.redirect("/") + else: + self.redirect(page.url) class SearchHandler(auth.CacheMixin, base.BaseHandler): -- 2.47.2