From 8786b8d49c3ea423aa233eb609b872cc36e41ab1 Mon Sep 17 00:00:00 2001 From: Noah Petherbridge Date: Mon, 20 Jul 2015 14:09:14 -0700 Subject: [PATCH] Fix blog default category --- rophako/app.py | 23 ++-------------- rophako/modules/blog/__init__.py | 4 ++- .../modules/blog/templates/blog/entry.html | 2 +- .../blog/templates/blog/entry.inc.html | 4 ++- .../modules/blog/templates/blog/index.html | 2 +- .../blog/templates/blog/index.inc.html | 2 +- rophako/utils.py | 26 +++++++++++++++++++ 7 files changed, 37 insertions(+), 26 deletions(-) diff --git a/rophako/app.py b/rophako/app.py index 4209060..c5f4b68 100644 --- a/rophako/app.py +++ b/rophako/app.py @@ -8,7 +8,6 @@ from flask import (Flask, g, request, session, render_template, send_file, from flask_sslify import SSLify import jinja2 import os.path -import time import sys # Get the Flask app object ready right away so other modules can import it @@ -29,7 +28,6 @@ from rophako.settings import Config Config.load_settings() Config.load_plugins() -from rophako import __version__ from rophako.plugin import load_plugin from rophako.log import logger #import rophako.model.tracking as Tracking @@ -64,6 +62,7 @@ app.jinja_loader = jinja2.ChoiceLoader([ jinja2.FileSystemLoader(x) for x in tem app.jinja_env.globals["csrf_token"] = rophako.utils.generate_csrf_token app.jinja_env.globals["include_page"] = rophako.utils.include +app.jinja_env.globals["settings"] = lambda: Config # Preload the emoticon data. import rophako.model.emoticons as Emoticons @@ -75,25 +74,7 @@ def before_request(): """Called before all requests. Initialize global template variables.""" # Default template vars. - g.info = { - "time": time.time(), - "app": { - "name": "Rophako", - "version": __version__, - "python_version": "{}.{}".format(sys.version_info.major, sys.version_info.minor), - "author": "Noah Petherbridge", - "photo_url": Config.photo.root_public, - }, - "uri": request.path, - "session": { - "login": False, # Not logged in, until proven otherwise. - "username": "guest", - "uid": 0, - "name": "Guest", - "role": "user", - }, - #"tracking": Tracking.track_visit(request, session), - } + g.info = rophako.utils.default_vars() # Default session vars. if not "login" in session: diff --git a/rophako/modules/blog/__init__.py b/rophako/modules/blog/__init__.py index d314075..44c105f 100644 --- a/rophako/modules/blog/__init__.py +++ b/rophako/modules/blog/__init__.py @@ -416,9 +416,11 @@ def partial_index(template_name="blog/index.inc.html"): pool = {} # The set of blog posts to show. category = g.info.get("url_category", None) + if category == Config.blog.default_category: + category = "" # Are we narrowing by category? - if category: + if category is not None: # Narrow down the index to just those that match the category. for post_id, data in index.items(): if not category in data["categories"]: diff --git a/rophako/modules/blog/templates/blog/entry.html b/rophako/modules/blog/templates/blog/entry.html index 805738c..862ec25 100644 --- a/rophako/modules/blog/templates/blog/entry.html +++ b/rophako/modules/blog/templates/blog/entry.html @@ -7,4 +7,4 @@ {% from "blog/entry.inc.html" import blog_entry %} {{ blog_entry(post) }} -{% endblock %} \ No newline at end of file +{% endblock %} diff --git a/rophako/modules/blog/templates/blog/entry.inc.html b/rophako/modules/blog/templates/blog/entry.inc.html index d67d88a..18853d2 100644 --- a/rophako/modules/blog/templates/blog/entry.inc.html +++ b/rophako/modules/blog/templates/blog/entry.inc.html @@ -39,7 +39,9 @@
Categories: {% if post["categories"]|length == 0 or (post["categories"]|length == 1 and post["categories"][0] == "") %} - Uncategorized{# TODO hardcoded name #} + + {{ settings().blog.default_category }} + {% else %}