Don't need to ask the question twice

This commit is contained in:
mike cullerton 2021-12-03 12:18:17 -05:00
parent 7ca7de177e
commit 791328d520
1 changed files with 6 additions and 8 deletions

View File

@ -12,11 +12,10 @@ class SetStudyStatus(Script):
def do_task_validate_only(self, task, study_id, workflow_id, *args, **kwargs): def do_task_validate_only(self, task, study_id, workflow_id, *args, **kwargs):
new_status = None if 'new_status' in kwargs.keys() or len(args) > 0:
if 'status' in kwargs.keys() or len(args) > 0: if 'new_status' in kwargs.keys():
if 'status' in kwargs.keys(): new_status = kwargs['new_status']
new_status = kwargs['status'] else:
elif len(args) > 0:
new_status = args[0] new_status = args[0]
try: try:
@ -37,11 +36,10 @@ class SetStudyStatus(Script):
def do_task(self, task, study_id, workflow_id, *args, **kwargs): def do_task(self, task, study_id, workflow_id, *args, **kwargs):
# Get new status # Get new status
new_status = None if 'new_status' in kwargs.keys() or len(args) > 0:
if 'status' in kwargs.keys() or len(args) > 0:
if 'new_status' in kwargs.keys(): if 'new_status' in kwargs.keys():
new_status = kwargs['new_status'] new_status = kwargs['new_status']
elif len(args) > 0: else:
new_status = args[0] new_status = args[0]
# Get StudyStatus object for new_status # Get StudyStatus object for new_status