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

Merge pull request #773 from dod-ccpo/view-application-settings

Browse Source 
portfolio user can view application settings page
This commit is contained in:
dandds 2019-04-17 14:54:11 -04:00 committed by GitHub
commit 24764fbe85
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
atst/routes/portfolios/applications.py
View File

@ -67,7 +67,7 @@ def get_environments_obj_for_app(application):
@portfolios_bp.route("/portfolios/<portfolio_id>/applications/<application_id>/edit") @portfolios_bp.route("/portfolios/<portfolio_id>/applications/<application_id>/edit")
@user_can(Permissions.EDIT_APPLICATION, message="view application edit form") @user_can(Permissions.VIEW_APPLICATION, message="view application edit form")
def edit_application(portfolio_id, application_id): def edit_application(portfolio_id, application_id):
application = Applications.get(application_id, portfolio_id=portfolio_id) application = Applications.get(application_id, portfolio_id=portfolio_id)
form = ApplicationForm(name=application.name, description=application.description) form = ApplicationForm(name=application.name, description=application.description)

2
templates/portfolios/applications/index.html
View File

@ -42,7 +42,7 @@
<h3 class='icon-link accordion__title' v-on:click="props.toggle">{{ application.name }}</h3> <h3 class='icon-link accordion__title' v-on:click="props.toggle">{{ application.name }}</h3>
<span class='accordion__description'>{{ application.description }}</span> <span class='accordion__description'>{{ application.description }}</span>
<div class='accordion__actions'> <div class='accordion__actions'>
{% if user_can(permissions.EDIT_APPLICATION) %} {% if user_can(permissions.VIEW_APPLICATION) %}
<a class='icon-link' href='{{ url_for("portfolios.edit_application", portfolio_id=portfolio.id, application_id=application.id) }}'> <a class='icon-link' href='{{ url_for("portfolios.edit_application", portfolio_id=portfolio.id, application_id=application.id) }}'>
<span>{{ "portfolios.applications.app_settings_text" | translate }}</span> <span>{{ "portfolios.applications.app_settings_text" | translate }}</span>
</a> </a>

2
tests/test_access.py
View File

@ -243,7 +243,7 @@ def test_portfolios_delete_application_access(post_url_assert_status, monkeypatc
# portfolios.edit_application # portfolios.edit_application
def test_portfolios_edit_application_access(get_url_assert_status): def test_portfolios_edit_application_access(get_url_assert_status):
ccpo = user_with(PermissionSets.EDIT_PORTFOLIO_APPLICATION_MANAGEMENT) ccpo = user_with(PermissionSets.VIEW_PORTFOLIO_APPLICATION_MANAGEMENT)
owner = user_with() owner = user_with()
rando = user_with() rando = user_with()
portfolio = PortfolioFactory.create( portfolio = PortfolioFactory.create(