force push
This commit is contained in:
parent
d3e2d1b91c
commit
534e697dd4
1 changed files with 0 additions and 11 deletions
|
@ -14,7 +14,6 @@ from .subscriptions import *
|
||||||
from .userblock import *
|
from .userblock import *
|
||||||
from .badges import *
|
from .badges import *
|
||||||
from .clients import *
|
from .clients import *
|
||||||
from .paypal import PayPalTxn
|
|
||||||
from drama.__main__ import Base, cache
|
from drama.__main__ import Base, cache
|
||||||
from drama.helpers.security import *
|
from drama.helpers.security import *
|
||||||
|
|
||||||
|
@ -155,11 +154,6 @@ class User(Base, Stndrd, Age_times):
|
||||||
lazy="dynamic",
|
lazy="dynamic",
|
||||||
primaryjoin="User.id==SaveRelationship.user_id")
|
primaryjoin="User.id==SaveRelationship.user_id")
|
||||||
|
|
||||||
_transactions = relationship(
|
|
||||||
"PayPalTxn",
|
|
||||||
lazy="dynamic",
|
|
||||||
primaryjoin="PayPalTxn.user_id==User.id")
|
|
||||||
|
|
||||||
# properties defined as SQL server-side functions
|
# properties defined as SQL server-side functions
|
||||||
referral_count = deferred(Column(Integer, server_default=FetchedValue()))
|
referral_count = deferred(Column(Integer, server_default=FetchedValue()))
|
||||||
follower_count = deferred(Column(Integer, server_default=FetchedValue()))
|
follower_count = deferred(Column(Integer, server_default=FetchedValue()))
|
||||||
|
@ -967,11 +961,6 @@ class User(Base, Stndrd, Age_times):
|
||||||
def boards_modded_ids(self):
|
def boards_modded_ids(self):
|
||||||
return [x.id for x in self.boards_modded]
|
return [x.id for x in self.boards_modded]
|
||||||
|
|
||||||
@property
|
|
||||||
def txn_history(self):
|
|
||||||
|
|
||||||
return self._transactions.filter(PayPalTxn.status != 1).order_by(PayPalTxn.created_utc.desc()).all()
|
|
||||||
|
|
||||||
@property
|
@property
|
||||||
def json_admin(self):
|
def json_admin(self):
|
||||||
data = self.json_raw
|
data = self.json_raw
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue