wiki: Simplify code when saving a page

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/src/backend/wiki.py b/src/backend/wiki.py
index 493837ccc8d0564f3a458377652acf174490c782..5a285ea8f88e3e639db3d6082e1be048126965a5 100644 (file)
--- 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 b3b409c17c4ecee690c88740829602734bc133b3..a62304ca75cf246c80e47d557c6e88067be5364d 100644 (file)
--- 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):