Merge pull request #803 from dod-ccpo/edit-environment-save-fail-refactor

Edit environment save fail refactor
This commit is contained in:
George Drummond
2019-05-06 13:54:30 -04:00
committed by GitHub
7 changed files with 84 additions and 23 deletions

View File

@@ -1,10 +1,10 @@
{% macro SaveButton(text, element="button", additional_classes="", form=None) -%}
{% set class = "usa-button usa-button-primary" + additional_classes %}
{% if element == "button" %}
<button type="submit" class="{{ class }}" tabindex="0" v-bind:disabled="!changed" {{ form_attr }} >
<button type="submit" class="{{ class }}" tabindex="0" v-bind:disabled="!changed || invalid" {{ form_attr }} >
{{ text }}
</button>
{% elif element == 'input' %}
<input type="submit" class="{{ class }}" tabindex="0" v-bind:disabled="!changed" value="{{ text }}" {% if form %}form="{{ form }}"{% endif %} />
<input type="submit" class="{{ class }}" tabindex="0" v-bind:disabled="!changed || invalid" value="{{ text }}" {% if form %}form="{{ form }}"{% endif %} />
{% endif %}
{%- endmacro %}

View File

@@ -48,11 +48,12 @@
<ul class="accordion-table__items">
{% for env in environments_obj %}
{% set edit_form = env['edit_form'] %}
{% set member_count = env['members_form'].data['team_roles'] | length %}
{% set members_by_role = env['members'] %}
{% set unassigned = members_by_role['no_access'] %}
<toggler inline-template>
<toggler inline-template {% if edit_form.errors %}initial-selected-section="edit"{% endif %}>
<li class="accordion-table__item">
<div class="accordion-table__item-content row">
<div class="col col--grow">
@@ -107,10 +108,9 @@
{% call ToggleSection(section_name="edit") %}
<ul>
<li class="accordion-table__item__expanded">
{% set edit_form = env['edit_form'] %}
<form action="{{ url_for('applications.update_environment', environment_id=env['id']) }}" method="post">
<form action="{{ url_for('applications.update_environment', environment_id=env['id']) }}" method="post" v-on:submit="handleSubmit">
{{ edit_form.csrf_token }}
{{ TextInput(edit_form.name) }}
{{ TextInput(edit_form.name, validation='requiredField') }}
{{
SaveButton(
text=("portfolios.applications.update_button_text" | translate)