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

Rename method

Browse Source
This commit is contained in:
Montana 2019-03-07 15:50:10 -05:00
parent 7fb9a7572c
commit acf70d1144
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
atst/routes/task_orders/new.py
View File

@ -120,14 +120,14 @@ class ShowTaskOrderWorkflow:
else: else:
return False return False
def can_edit_pf_attributes(self, portfolio_id=None): def pf_attributes_read_only(self, portfolio_id=None):
if self.task_order: if self.task_order:
if self.task_order.portfolio.num_task_orders > 1: if self.task_order.portfolio.num_task_orders > 1:
return False return True
elif portfolio_id: elif portfolio_id:
if self.get_portfolio(portfolio_id).num_task_orders > 0: if self.get_portfolio(portfolio_id).num_task_orders > 0:
return False
return True return True
return False
def get_portfolio(self, portfolio_id=None): def get_portfolio(self, portfolio_id=None):
if self.task_order: if self.task_order:
@ -155,7 +155,7 @@ class UpdateTaskOrderWorkflow(ShowTaskOrderWorkflow):
@property @property
def form(self): def form(self):
if not self.can_edit_pf_attributes(self.portfolio_id) and self.screen == 1: if self.pf_attributes_read_only(self.portfolio_id) and self.screen == 1:
return task_order_form.AppInfoWithExistingPortfolioForm(self.form_data) return task_order_form.AppInfoWithExistingPortfolioForm(self.form_data)
return self._form return self._form
@ -235,7 +235,7 @@ def new(screen, task_order_id=None, portfolio_id=None):
"complete": workflow.is_complete, "complete": workflow.is_complete,
} }
if not workflow.can_edit_pf_attributes(portfolio_id): if workflow.pf_attributes_read_only(portfolio_id):
template_args["portfolio"] = workflow.get_portfolio(portfolio_id=portfolio_id) template_args["portfolio"] = workflow.get_portfolio(portfolio_id=portfolio_id)
if screen == 1: if screen == 1:
workflow.form = task_order_form.AppInfoWithExistingPortfolioForm( workflow.form = task_order_form.AppInfoWithExistingPortfolioForm(

12
tests/routes/task_orders/test_new_task_order.py
View File

@ -45,7 +45,7 @@ def serialize_dates(data):
def test_new_to_can_edit_pf_attributes_screen_1(): def test_new_to_can_edit_pf_attributes_screen_1():
portfolio = PortfolioFactory.create() portfolio = PortfolioFactory.create()
workflow = ShowTaskOrderWorkflow(user=portfolio.owner) workflow = ShowTaskOrderWorkflow(user=portfolio.owner)
assert workflow.can_edit_pf_attributes(portfolio.id) assert not workflow.pf_attributes_read_only(portfolio.id)
def test_new_pf_can_edit_pf_attributes_on_back_navigation(): def test_new_pf_can_edit_pf_attributes_on_back_navigation():
@ -54,7 +54,7 @@ def test_new_pf_can_edit_pf_attributes_on_back_navigation():
pf_workflow = ShowTaskOrderWorkflow( pf_workflow = ShowTaskOrderWorkflow(
user=pf_task_order.creator, task_order_id=pf_task_order.id user=pf_task_order.creator, task_order_id=pf_task_order.id
) )
assert pf_workflow.can_edit_pf_attributes() assert not pf_workflow.pf_attributes_read_only()
def test_to_on_pf_cannot_edit_pf_attributes(): def test_to_on_pf_cannot_edit_pf_attributes():
@ -63,14 +63,14 @@ def test_to_on_pf_cannot_edit_pf_attributes():
workflow = ShowTaskOrderWorkflow(user=portfolio.owner) workflow = ShowTaskOrderWorkflow(user=portfolio.owner)
assert portfolio.num_task_orders == 1 assert portfolio.num_task_orders == 1
assert not workflow.can_edit_pf_attributes(portfolio.id) assert workflow.pf_attributes_read_only(portfolio.id)
second_task_order = TaskOrderFactory(portfolio=portfolio) second_task_order = TaskOrderFactory(portfolio=portfolio)
workflow = ShowTaskOrderWorkflow( second_workflow = ShowTaskOrderWorkflow(
user=second_task_order.creator, task_order_id=second_task_order.id user=portfolio.owner, task_order_id=second_task_order.id
) )
assert portfolio.num_task_orders > 1 assert portfolio.num_task_orders > 1
assert not workflow.can_edit_pf_attributes() assert second_workflow.pf_attributes_read_only()
def test_get_portfolio_when_task_order_exists(): def test_get_portfolio_when_task_order_exists():