trustchain-oc1-orchestral
/
devicehub-teal
Archived
10
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixing model

This commit is contained in:
Cayo Puigdefabregas 2021-04-27 13:54:13 +02:00
parent 330f2b7b78
commit c1081994de
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
ereuse_devicehub/resources/action/models.py
View File

@ -1440,7 +1440,7 @@ class TradeNote(JoinedTableMixin, ActionWithMultipleDevices):
nullable=False) nullable=False)
trade = db.relationship('Trade', trade = db.relationship('Trade',
backref=backref('notes', backref=backref('notes',
uselist=True, uselist=True,
lazy=True), lazy=True),
primaryjoin='TradeNote.trade_id == Trade.id') primaryjoin='TradeNote.trade_id == Trade.id')
@ -1460,8 +1460,10 @@ class Confirm(JoinedTableMixin, ActionWithMultipleDevices):
nullable=False) nullable=False)
action = db.relationship('Action', action = db.relationship('Action',
backref=backref('acceptances', backref=backref('acceptances',
uselist=True, uselist=True,
lazy=True), lazy=True,
order_by=lambda: Action.end_time,
collection_class=list),
primaryjoin='Confirm.action_id == Action.id') primaryjoin='Confirm.action_id == Action.id')
def __repr__(self) -> str: def __repr__(self) -> str:
@ -1469,9 +1471,10 @@ class Confirm(JoinedTableMixin, ActionWithMultipleDevices):
origin = 'To' origin = 'To'
if self.user == self.action.user_from: if self.user == self.action.user_from:
origin = 'From' origin = 'From'
if self.revoke:
self.t = 'Revoke'
self.type = 'Revoke'
return '<{0.t} {0.id} accepted by {1}>'.format(self, origin) return '<{0.t} {0.id} accepted by {1}>'.format(self, origin)
if self.action == 'Confirm':
return '<{0.t} {0.id} Revoke Confirm {0.action.id}>'.format(self)
class Trade(JoinedTableMixin, ActionWithMultipleDevices): class Trade(JoinedTableMixin, ActionWithMultipleDevices):