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

Minor updates

This commit is contained in:
emmdim 2019-12-17 17:16:13 +01:00 committed by nad
parent 80e9badbee
commit 619e7f27e9
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ereuse_devicehub/resources/lot/models.py
View File

@ -73,8 +73,7 @@ class Lot(Thing):
transfer_state.comment = TransferState.__doc__ transfer_state.comment = TransferState.__doc__
receiver_id = db.Column(CIText(), receiver_id = db.Column(CIText(),
db.ForeignKey(User.ethereum_address), db.ForeignKey(User.ethereum_address),
nullable=True, nullable=True)
default=lambda: g.user.ethereum_address)
receiver = db.relationship(User, primaryjoin=receiver_id == User.ethereum_address) receiver = db.relationship(User, primaryjoin=receiver_id == User.ethereum_address)
delivery_note_address = db.Column(CIText(), nullable=True) delivery_note_address = db.Column(CIText(), nullable=True)

2
ereuse_devicehub/resources/lot/views.py
View File

@ -40,7 +40,7 @@ class LotView(View):
return ret return ret
def patch(self, id): def patch(self, id):
patch_schema = self.resource_def.SCHEMA(only=('name', 'description', 'transfer_state', 'receiver', 'deposit'), partial=True) patch_schema = self.resource_def.SCHEMA(only=('name', 'description', 'transfer_state', 'receiver_id', 'deposit', 'delivery_note_address'), partial=True)
l = request.get_json(schema=patch_schema) l = request.get_json(schema=patch_schema)
lot = Lot.query.filter_by(id=id).one() lot = Lot.query.filter_by(id=id).one()
if lot.transfer_state.name == 'Initial': if lot.transfer_state.name == 'Initial':