small fixes in TaskOrders.add_officer
This commit is contained in:
parent
95e7adfcf3
commit
ccd75bcaca
@ -110,25 +110,25 @@ class TaskOrders(object):
|
||||
(
|
||||
member
|
||||
for member in workspace.members
|
||||
if member.user.dod_id is officer_data["dod_id"]
|
||||
if member.user.dod_id == officer_data["dod_id"]
|
||||
),
|
||||
None,
|
||||
)
|
||||
|
||||
if existing_member:
|
||||
user = existing_member.user
|
||||
workspace_user = existing_member.user
|
||||
else:
|
||||
member = Workspaces.create_member(
|
||||
user, workspace, {**officer_data, "workspace_role": "officer"}
|
||||
)
|
||||
user = member.user
|
||||
workspace_user = member.user
|
||||
|
||||
setattr(task_order, officer_type, user)
|
||||
setattr(task_order, officer_type, workspace_user)
|
||||
|
||||
db.session.add(task_order)
|
||||
db.session.commit()
|
||||
|
||||
return user
|
||||
return workspace_user
|
||||
else:
|
||||
raise TaskOrderError(
|
||||
"{} is not an officer role on task orders".format(officer_type)
|
||||
|
Loading…
x
Reference in New Issue
Block a user