forked from MarseyWorld/MarseyWorld
sneed
parent
a80ad6a419
commit
032d78e576
|
@ -14,7 +14,6 @@ from .subscriptions import *
|
|||
from .userblock import *
|
||||
from .badges import *
|
||||
from .clients import *
|
||||
from .paypal import PayPalTxn
|
||||
from drama.__main__ import Base, cache
|
||||
from drama.helpers.security import *
|
||||
|
||||
|
@ -155,11 +154,6 @@ class User(Base, Stndrd, Age_times):
|
|||
lazy="dynamic",
|
||||
primaryjoin="User.id==SaveRelationship.user_id")
|
||||
|
||||
_transactions = relationship(
|
||||
"PayPalTxn",
|
||||
lazy="dynamic",
|
||||
primaryjoin="PayPalTxn.user_id==User.id")
|
||||
|
||||
# properties defined as SQL server-side functions
|
||||
referral_count = deferred(Column(Integer, server_default=FetchedValue()))
|
||||
follower_count = deferred(Column(Integer, server_default=FetchedValue()))
|
||||
|
@ -934,11 +928,6 @@ class User(Base, Stndrd, Age_times):
|
|||
def boards_modded_ids(self):
|
||||
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
|
||||
def json_admin(self):
|
||||
data = self.json_raw
|
||||
|
|
Loading…
Reference in New Issue