Merge branch 'master' into fix-authz

[bluechips.git] / bluechips / model / __init__.py

diff --git a/bluechips/model/__init__.py b/bluechips/model/__init__.py
index 3c71c6ed15d54a75ae4056a1c81a8c101be98826..4b016eab8223392a79cc32f5a02f669bec2c9b07 100644 (file)
--- a/bluechips/model/__init__.py
+++ b/bluechips/model/__init__.py
@@ -77,11 +77,11 @@ transfers = sa.Table('transfers', meta.metadata,
 orm.mapper(User, users,
            properties={
         'expenditures': orm.relation(Expenditure,
-                                     backref='spender',
-                                     lazy=False)
+                                     backref='spender')
 })
 
-orm.mapper(Expenditure, expenditures, order_by=expenditures.c.date.desc(),
+orm.mapper(Expenditure, expenditures,
+           order_by=[expenditures.c.date.desc(), expenditures.c.entered_time.desc()],
            properties={
         'splits': orm.relation(Split, backref='expenditure',
                                cascade='all, delete'),
@@ -97,16 +97,15 @@ orm.mapper(Subitem, subitems, properties={
         'user': orm.relation(User)
 })
 
-orm.mapper(Transfer, transfers, order_by=transfers.c.date.desc(),
+orm.mapper(Transfer, transfers,
+           order_by=[transfers.c.date.desc(), transfers.c.entered_time.desc()],
            properties={
         'debtor': orm.relation(User,
                                primaryjoin=(transfers.c.debtor_id==\
-                                                users.c.id),
-                               lazy=False),
+                                                users.c.id)),
         'creditor': orm.relation(User,
                                  primaryjoin=(transfers.c.creditor_id==\
-                                                  users.c.id),
-                                 lazy=False)
+                                                  users.c.id))
 })
 
 __all__ = ['users', 'expenditures', 'splits', 'subitems', 'transfers',