summaryrefslogtreecommitdiff
path: root/controller.py
diff options
context:
space:
mode:
authorRené 'Necoro' Neumann <necoro@necoro.net>2011-02-15 05:15:56 +0100
committerRené 'Necoro' Neumann <necoro@necoro.net>2011-02-15 05:15:56 +0100
commit799044377866ce3d2322a66ce993023d5cec3396 (patch)
tree3a53e5efc64c55326de4d315d9f41df08009e1fc /controller.py
parent4c2f57bc0323e7c61975d62b6bb443e2e3e32df5 (diff)
downloadkosten-799044377866ce3d2322a66ce993023d5cec3396.tar.gz
kosten-799044377866ce3d2322a66ce993023d5cec3396.tar.bz2
kosten-799044377866ce3d2322a66ce993023d5cec3396.zip
fix previous
Diffstat (limited to 'controller.py')
-rw-r--r--controller.py7
1 files changed, 4 insertions, 3 deletions
diff --git a/controller.py b/controller.py
index 0e68491..34d06d9 100644
--- a/controller.py
+++ b/controller.py
@@ -188,15 +188,16 @@ class ConstAdd:
CE = ConstExpense
# get the list of 'previous' expenses
- prev_list = CE.query.filter(CE.next == None)
+ filter = (CE.next == None)
cur = self.get_expense()
if cur.id is None: # empty
session.expunge(cur)
else:
- prev_list = prev_list.filter(CE.id != cur.id)
+ filter = sql.or_(CE.next == cur, filter)
+ filter = sql.and_(filter, CE.id != cur.id)
- prev_list = prev_list.order_by(CE.description).values(CE.id, CE.description)
+ prev_list = CE.query.filter(filter).order_by(CE.description).values(CE.id, CE.description)
return Form(
form.Textbox(