'templated' and wrapped 'redirect'

1 files changed, 13 insertions, 13 deletions

diff --git a/app/views/expenses.py b/app/views/expenses.py
index 583ac79..c0d9c65 100644
--- a/app/views/expenses.py
+++ b/app/views/expenses.py
@@ -1,5 +1,5 @@
 from ..flask_extend import Blueprint
-from flask import render_template, request, url_for, redirect
+from flask import request
 
 import datetime, decimal
 from sqlalchemy import sql, func
@@ -7,12 +7,10 @@ from sqlalchemy import sql, func
 from ..model import db, Category, SingleExpense, CatExpense, MonthExpense
 
 from ..forms import ExpenseForm
+from ..utils import templated, redirect
 
 mod = Blueprint('expenses', __name__)
 
-def T(tpl):
-    return "expenses/%s.jinja" % tpl
-
 def expense_form(obj=None):
     form = ExpenseForm(obj=obj)
     form.category.query = Category.query.order_by(Category.name)
@@ -48,13 +46,15 @@ def is_last(exp):
     return exp.date >= datetime.date.today().replace(day = 1)
 
 @mod.route("/<int(fixed_digits=4):year>/<int(fixed_digits=2):month>")
+@templated("show")
 def show_date(year, month):
     c = calc_month_exp(year, month)
-    return render_template(T("show"), exps = [c])
+    return { 'exps' : [c] }
 
 mod.add_url_rule("/<path:p>", endpoint = "show_date_str", build_only = True)
 
 @mod.route("/")
+@templated()
 def show():
     d = datetime.date.today()
             
@@ -64,15 +64,14 @@ def show():
     else:
         second = calc_month_exp(d.year, d.month - 1)
 
-    return render_template(T("show"), exps = [first, second])
+    return { 'exps' : [first, second] }
 
 @mod.route("/edit/<int:id>", methods=("GET", "POST"))
+@templated()
 def edit(id):
     exp = SingleExpense.get(id)
     form = expense_form(exp)
 
-    ret = lambda: render_template(T("edit"), form=form)
-
     if request.method == "POST":
         if "deleteB" in request.form:
             db.session.delete(exp)
@@ -81,14 +80,15 @@ def edit(id):
             form.populate_obj(exp)
 
         else:
-            return ret()
+            return { 'form': form }
 
         db.session.commit()
-        return redirect(url_for("index"))
+        return redirect("index")
 
-    return ret()
+    return { 'form': form }
 
 @mod.route("/add/", methods=("GET", "POST"))
+@templated()
 def add():
     form = expense_form()
 
@@ -100,6 +100,6 @@ def add():
         db.session.add(exp)
         db.session.commit()
 
-        return redirect(url_for(".add"))
+        return redirect(".add")
 
-    return render_template(T("add"), form=form)
+    return { 'form': form }