Allow @templated to be called raw, i.e. w/o ()

5 files changed, 20 insertions, 10 deletions

diff --git a/app/utils.py b/app/utils.py
index e6a7c95..1d5f73c 100644
--- a/app/utils.py
+++ b/app/utils.py
@@ -8,6 +8,12 @@ def _gen_tpl(endpoint):
     return endpoint.replace('.', '/') + '.jinja'
 
 def templated(template=None):
+    fun = None
+    if template is not None and callable(template):
+        # a function was passed in
+        fun = template
+        template = None
+
     def decorator(f):
         @wraps(f)
         def decorated_function(*args, **kwargs):
@@ -25,7 +31,11 @@ def templated(template=None):
                 return ctx
             return render_template(template_name, **ctx)
         return decorated_function
-    return decorator
+
+    if fun is None:
+        return decorator
+    else:
+        return decorator(fun)
 
 def redirect (target, **kwargs):
     code = kwargs.pop('_code', None)
diff --git a/app/views/categories.py b/app/views/categories.py
index 347828b..0bb64ef 100644
--- a/app/views/categories.py
+++ b/app/views/categories.py
@@ -8,7 +8,7 @@ mod = Blueprint('categories', __name__)
 
 @mod.route('/', methods=('GET', 'POST'))
 @login_required
-@templated()
+@templated
 def manage ():
 
     if request.method == 'GET':
diff --git a/app/views/consts.py b/app/views/consts.py
index dbf2422..cb50704 100644
--- a/app/views/consts.py
+++ b/app/views/consts.py
@@ -33,7 +33,7 @@ def const_form(cur=None, obj=None):
 
 @mod.route('/')
 @login_required
-@templated()
+@templated
 def list ():
     d = today()
 
@@ -57,14 +57,14 @@ def list ():
 @mod.route('/<int:id>')
 @login_required
 @assert_authorisation('id')
-@templated()
+@templated
 def show(id):
     return { 'exp': ConstExpense.get(id) }
 
 @mod.route('/edit/<int:id>', methods=('GET', 'POST'))
 @login_required
 @assert_authorisation('id')
-@templated()
+@templated
 def edit(id):
     exp = ConstExpense.get(id)
     form = const_form(exp)
@@ -104,7 +104,7 @@ def add_from(other):
 
 @mod.route('/add/', methods=('GET', 'POST'))
 @login_required
-@templated()
+@templated
 def add ():
     exp = ConstExpense()
 
diff --git a/app/views/expenses.py b/app/views/expenses.py
index e7777ab..181493e 100644
--- a/app/views/expenses.py
+++ b/app/views/expenses.py
@@ -70,7 +70,7 @@ mod.add_url_rule('/<path:p>', endpoint = 'show_date_str', build_only = True)
 
 @mod.route('/')
 @login_required
-@templated()
+@templated
 def show():
     d = datetime.date.today()
             
@@ -85,7 +85,7 @@ def show():
 @mod.route('/edit/<int:id>', methods=('GET', 'POST'))
 @login_required
 @assert_authorisation('id')
-@templated()
+@templated
 def edit(id):
     exp = SingleExpense.get(id)
     form = expense_form(exp)
@@ -107,7 +107,7 @@ def edit(id):
 
 @mod.route('/add/', methods=('GET', 'POST'))
 @login_required
-@templated()
+@templated
 def add():
     form = expense_form()
 
diff --git a/app/views/login.py b/app/views/login.py
index 333a330..7b46665 100644
--- a/app/views/login.py
+++ b/app/views/login.py
@@ -11,7 +11,7 @@ from flask import redirect
 mod = Blueprint('login', __name__)
 
 @mod.route('/login', methods=('GET', 'POST'))
-@templated()
+@templated
 def login():
    form = LoginForm(flash=u"Login fehlgeschlagen!")