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

Merge pull request #152 from eReuse/feature/endpoint-confirm 

fixing bug taiga 2280
This commit is contained in:
cayop 2021-06-16 12:05:45 +02:00 committed by GitHub
parent f59d697099 00d2b2e81f
commit d9eca96e77
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
ereuse_devicehub/resources/action/schemas.py
View File

@ -577,11 +577,19 @@ class Trade(ActionWithMultipleDevices):
@validates_schema
def validate_email_users(self, data: dict):
"""We need at least one user"""
if not (data['user_from_email'] or data['user_to_email']):
confirm = data['confirm']
user_from = data['user_from_email']
user_to = data['user_to_email']
if not (user_from or user_to):
txt = "you need one user from or user to for to do a trade"
raise ValidationError(txt)
if not g.user.email in [data['user_from_email'], data['user_to_email']]:
if confirm and not (user_from and user_to):
txt = "you need one user for to do a trade"
raise ValidationError(txt)
if not g.user.email in [user_from, user_to]:
txt = "you need to be one of participate of the action"
raise ValidationError(txt)
@ -596,7 +604,8 @@ class Trade(ActionWithMultipleDevices):
txt = "you need a code to be able to do the traceability"
raise ValidationError(txt)
data['code'] = data['code'].replace('@', '_')
if not data['confirm']:
data['code'] = data['code'].replace('@', '_')
class InitTransfer(Trade):