pk/atst
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

when KO accepts invite, redirect to TO view page

Browse Source
This commit is contained in:
dandds 2019-01-23 10:05:03 -05:00
parent c16c5501cc
commit b7f90bcbd6
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
atst/routes/portfolios/invitations.py
View File

@ -28,7 +28,11 @@ def accept_invitation(token):
for task_order in invite.portfolio.task_orders: for task_order in invite.portfolio.task_orders:
if g.current_user == task_order.contracting_officer: if g.current_user == task_order.contracting_officer:
return redirect( return redirect(
url_for("task_orders.new", screen=4, task_order_id=task_order.id) url_for(
"portfolios.view_task_order",
portfolio_id=task_order.portfolio_id,
task_order_id=task_order.id,
)
) )
elif g.current_user == task_order.contracting_officer_representative: elif g.current_user == task_order.contracting_officer_representative:
return redirect( return redirect(

7
tests/routes/portfolios/test_invitations.py
View File

@ -210,7 +210,7 @@ def test_existing_member_invite_resent_to_email_submitted_in_form(
assert send_mail_job.args[0] == ["example@example.com"] assert send_mail_job.args[0] == ["example@example.com"]
def test_task_order_officer_accepts_invite(monkeypatch, client, user_session): def test_contracting_officer_accepts_invite(monkeypatch, client, user_session):
portfolio = PortfolioFactory.create() portfolio = PortfolioFactory.create()
task_order = TaskOrderFactory.create(portfolio=portfolio) task_order = TaskOrderFactory.create(portfolio=portfolio)
user_info = UserFactory.dictionary() user_info = UserFactory.dictionary()
@ -246,6 +246,9 @@ def test_task_order_officer_accepts_invite(monkeypatch, client, user_session):
# user is redirected to the task order review page # user is redirected to the task order review page
assert response.status_code == 302 assert response.status_code == 302
to_review_url = url_for( to_review_url = url_for(
"task_orders.new", screen=4, task_order_id=task_order.id, _external=True "portfolios.view_task_order",
portfolio_id=task_order.portfolio_id,
task_order_id=task_order.id,
_external=True,
) )
assert response.headers["Location"] == to_review_url assert response.headers["Location"] == to_review_url