Use list of officer to determine if the current_user is an officer
Delete unused method
This commit is contained in:
parent
e3956180b4
commit
4bf70f10d8
@ -185,17 +185,6 @@ class TaskOrders(object):
|
|||||||
"{} is not an officer role on task orders".format(officer_type)
|
"{} is not an officer role on task orders".format(officer_type)
|
||||||
)
|
)
|
||||||
|
|
||||||
@classmethod
|
|
||||||
def is_officer_for_to(cls, task_order, user):
|
|
||||||
if (
|
|
||||||
user == task_order.contracting_officer
|
|
||||||
or user == task_order.contracting_officer_representative
|
|
||||||
or user == task_order.security_officer
|
|
||||||
):
|
|
||||||
return True
|
|
||||||
else:
|
|
||||||
return False
|
|
||||||
|
|
||||||
@classmethod
|
@classmethod
|
||||||
def add_dd_254(user, task_order, dd_254_data):
|
def add_dd_254(user, task_order, dd_254_data):
|
||||||
dd_254 = DD254(**dd_254_data)
|
dd_254 = DD254(**dd_254_data)
|
||||||
|
@ -3,7 +3,6 @@ from flask import g, redirect, url_for, render_template
|
|||||||
from . import portfolios_bp
|
from . import portfolios_bp
|
||||||
from atst.domain.portfolios import Portfolios
|
from atst.domain.portfolios import Portfolios
|
||||||
from atst.domain.invitations import Invitations
|
from atst.domain.invitations import Invitations
|
||||||
from atst.domain.task_orders import TaskOrders
|
|
||||||
from atst.queue import queue
|
from atst.queue import queue
|
||||||
from atst.utils.flash import formatted_flash as flash
|
from atst.utils.flash import formatted_flash as flash
|
||||||
|
|
||||||
@ -27,7 +26,7 @@ def accept_invitation(token):
|
|||||||
# - the logged-in user has multiple roles on the TO (e.g., KO and COR)
|
# - the logged-in user has multiple roles on the TO (e.g., KO and COR)
|
||||||
# - the logged-in user has officer roles on multiple unsigned TOs
|
# - the logged-in user has officer roles on multiple unsigned TOs
|
||||||
for task_order in invite.portfolio.task_orders:
|
for task_order in invite.portfolio.task_orders:
|
||||||
if TaskOrders.is_officer_for_to(task_order, g.current_user):
|
if g.current_user in task_order.officers:
|
||||||
return redirect(
|
return redirect(
|
||||||
url_for(
|
url_for(
|
||||||
"portfolios.view_task_order",
|
"portfolios.view_task_order",
|
||||||
|
Loading…
x
Reference in New Issue
Block a user