blog: Show unpublished posts

There is no point in hiding them as we normally don't publish top-secret
information on the wiki, but it makes it easier to pass around the link.

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

diff --git a/src/backend/blog.py b/src/backend/blog.py
index 675980695245409860f4cfe840a8ad5a10a44942..a626cb2e774981b8bc9de2e895af1a13e20fbc2e 100644 (file)
--- a/src/backend/blog.py
+++ b/src/backend/blog.py
@@ -30,11 +30,7 @@ class Blog(misc.Object):
                return self._get_post("SELECT * FROM blog \
                        WHERE id = %s", id)
 
-       def get_by_slug(self, slug, published=True):
-               if published:
-                       return self._get_post("SELECT * FROM blog \
-                               WHERE slug = %s AND published_at <= NOW()", slug)
-
+       def get_by_slug(self, slug):
                return self._get_post("SELECT * FROM blog \
                        WHERE slug = %s", slug)
 

diff --git a/src/web/blog.py b/src/web/blog.py
index e4a41a1ac773b65e6dbbb8543c7d41db3b1f7aa1..7ff5f06050ebe236c0e1a95f83cf1551cb1ee903 100644 (file)
--- a/src/web/blog.py
+++ b/src/web/blog.py
@@ -48,7 +48,7 @@ class FeedHandler(base.BaseHandler):
 
 class PostHandler(base.BaseHandler):
        def get(self, slug):
-               post = self.backend.blog.get_by_slug(slug, published=not self.current_user)
+               post = self.backend.blog.get_by_slug(slug)
                if not post:
                        raise tornado.web.HTTPError(404)
 
@@ -68,7 +68,7 @@ class PublishHandler(base.BaseHandler):
 
        @tornado.web.authenticated
        def get(self, slug):
-               post = self.backend.blog.get_by_slug(slug, published=False)
+               post = self.backend.blog.get_by_slug(slug)
                if not post:
                        raise tornado.web.HTTPError(404)
 
@@ -84,7 +84,7 @@ class PublishHandler(base.BaseHandler):
 
        @tornado.web.authenticated
        def post(self, slug):
-               post = self.backend.blog.get_by_slug(slug, published=False)
+               post = self.backend.blog.get_by_slug(slug)
                if not post:
                        raise tornado.web.HTTPError(404)
 
@@ -173,7 +173,7 @@ class WriteHandler(base.BaseHandler):
 class EditHandler(base.BaseHandler):
        @tornado.web.authenticated
        def get(self, slug):
-               post = self.backend.blog.get_by_slug(slug, published=False)
+               post = self.backend.blog.get_by_slug(slug)
                if not post:
                        raise tornado.web.HTTPError(404)
 
@@ -185,7 +185,7 @@ class EditHandler(base.BaseHandler):
 
        @tornado.web.authenticated
        def post(self, slug):
-               post = self.backend.blog.get_by_slug(slug, published=False)
+               post = self.backend.blog.get_by_slug(slug)
                if not post:
                        raise tornado.web.HTTPError(404, "Could not find post %s" % slug)
 
@@ -208,7 +208,7 @@ class EditHandler(base.BaseHandler):
 class DeleteHandler(base.BaseHandler):
        @tornado.web.authenticated
        def get(self, slug):
-               post = self.backend.blog.get_by_slug(slug, published=False)
+               post = self.backend.blog.get_by_slug(slug)
                if not post:
                        raise tornado.web.HTTPError(404)
 
@@ -220,7 +220,7 @@ class DeleteHandler(base.BaseHandler):
 
        @tornado.web.authenticated
        def post(self, slug):
-               post = self.backend.blog.get_by_slug(slug, published=False)
+               post = self.backend.blog.get_by_slug(slug)
                if not post:
                        raise tornado.web.HTTPError(404)