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

Merge pull request #986 from dod-ccpo/perms-app-settings-view

Browse Source 
Only user with edit app perms can see edit app form
This commit is contained in:
leigh-mil 2019-07-29 10:49:44 -04:00 committed by GitHub
commit ae3711c5d1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 50 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
styles/components/_portfolio_layout.scss
View File

@ -314,6 +314,10 @@
padding-bottom: 0; padding-bottom: 0;
padding-top: 0; padding-top: 0;
} }
input#delete-application {
margin-top: $gap * 3;
}
} }
.activity-log { .activity-log {

43
templates/portfolios/applications/settings.html
View File

@ -13,10 +13,10 @@
<div class='subheading'>{{ 'portfolios.applications.settings_heading' | translate }}</div> <div class='subheading'>{{ 'portfolios.applications.settings_heading' | translate }}</div>
{% if user_can(permissions.EDIT_APPLICATION) %}
<form method="POST" action="{{ url_for('applications.update', application_id=application.id) }}"> <form method="POST" action="{{ url_for('applications.update', application_id=application.id) }}">
<div class="panel"> <div class="panel">
<div class="panel__content"> <div class="panel__content">
{{ application_form.csrf_token }} {{ application_form.csrf_token }}
<p> <p>
{{ "fragments.edit_application_form.explain" | translate }} {{ "fragments.edit_application_form.explain" | translate }}
@ -24,34 +24,22 @@
<div class="form-row"> <div class="form-row">
<div class="form-col form-col--two-thirds"> <div class="form-col form-col--two-thirds">
{{ TextInput(application_form.name) }} {{ TextInput(application_form.name) }}
{{ TextInput(application_form.description, paragraph=True) }}
</div> </div>
<div class="form-col form-col--third"> <div class="form-col form-col--third">
{% if user_can(permissions.DELETE_APPLICATION) %} {% if user_can(permissions.DELETE_APPLICATION) %}
<div class="usa-input"> <div class="usa-input">
<label for="delete-application">
<div class="usa-input__title">
&nbsp;
</div>
</label>
<input <input
id="delete-application" id="delete-application"
type="button" type="button"
v-on:click="openModal('delete-application')" v-on:click="openModal('delete-application')"
class='usa-button button-danger-outline' class='usa-button button-danger-outline'
value="{{ "portfolios.applications.delete.button" | translate }}" value="{{ 'portfolios.applications.delete.button' | translate }}"
> >
</div> </div>
{% endif %} {% endif %}
</div> </div>
</div> </div>
<div class="form-row">
<div class="form-col form-col--two-thirds">
{{ TextInput(application_form.description, paragraph=True) }}
</div>
<div class="form-col form-col--third">
&nbsp;
</div>
</div>
</div> </div>
<div class="panel__footer"> <div class="panel__footer">
<div class="action-group"> <div class="action-group">
@ -60,6 +48,31 @@
</div> </div>
</div> </div>
</form> </form>
{% else %}
<div class="panel">
<div class="panel__content">
<p>
{{ "fragments.edit_application_form.explain" | translate }}
</p>
<div class="form-row">
<div class="form-col">
<div class="usa-input usa-input__title">
{{ application_form.name.label() }}
{{ application_form.name.data }}
</div>
</div>
</div>
<div class="form-row">
<div class="form-col">
<div class="usa-input usa-input__title">
{{ application_form.description.label() }}
{{ application_form.description.data }}
</div>
</div>
</div>
</div>
</div>
{% endif %}
<div id="application-environments"> <div id="application-environments">
<div class="accordion-table responsive-table-wrapper panel"> <div class="accordion-table responsive-table-wrapper panel">