Move application team permissions form.

The submit input needs to be inside the form to work on IE 10.
This commit is contained in:
dandds 2019-05-08 11:24:13 -04:00
parent 457b1f9523
commit 4afa88a3b2
2 changed files with 95 additions and 97 deletions

View File

@ -1,48 +1,46 @@
{% from "components/options_input.html" import OptionsInput %} {% from "components/options_input.html" import OptionsInput %}
<form method='POST' id="team" action='{{ url_for("applications.update_team", application_id=application.id) }}' autocomplete="off" enctype="multipart/form-data"> {{ team_form.csrf_token }}
{{ team_form.csrf_token }}
{% for member_form in team_form.members %} {% for member_form in team_form.members %}
{% set environment_roles_form = member_form.environment_roles %} {% set environment_roles_form = member_form.environment_roles %}
{% set permissions_form = member_form.permission_sets %} {% set permissions_form = member_form.permission_sets %}
<toggler inline-template> <toggler inline-template>
<li class="accordion-table__item"> <li class="accordion-table__item">
<div class="accordion-table__item-content row"> <div class="accordion-table__item-content row">
<div class="col col--grow">{{ member_form.user_name.data }}</div> <div class="col col--grow">{{ member_form.user_name.data }}</div>
<div class="col col--grow">{{ OptionsInput(permissions_form.perms_team_mgmt, label=False, watch=True) }}</div> <div class="col col--grow">{{ OptionsInput(permissions_form.perms_team_mgmt, label=False, watch=True) }}</div>
<div class="col col--grow">{{ OptionsInput(permissions_form.perms_env_mgmt, label=False, watch=True) }}</div> <div class="col col--grow">{{ OptionsInput(permissions_form.perms_env_mgmt, label=False, watch=True) }}</div>
<div class="col col--grow">{{ OptionsInput(permissions_form.perms_del_env, label=False, watch=True) }}</div> <div class="col col--grow">{{ OptionsInput(permissions_form.perms_del_env, label=False, watch=True) }}</div>
<div class="col col--grow icon-link icon-link--large accordion-table__item__toggler"> <div class="col col--grow icon-link icon-link--large accordion-table__item__toggler">
{% set open_html %} {% set open_html %}
{{ "portfolios.applications.team_settings.environments" | translate }} ({{ environment_roles_form | length }}) {{ Icon('caret_down') }} {{ "portfolios.applications.team_settings.environments" | translate }} ({{ environment_roles_form | length }}) {{ Icon('caret_down') }}
{% endset %} {% endset %}
{% set close_html %} {% set close_html %}
{{ "portfolios.applications.team_settings.environments" | translate }} ({{ environment_roles_form | length }}) {{ Icon('caret_up') }} {{ "portfolios.applications.team_settings.environments" | translate }} ({{ environment_roles_form | length }}) {{ Icon('caret_up') }}
{% endset %} {% endset %}
{{ {{
ToggleButton( ToggleButton(
open_html=open_html, open_html=open_html,
close_html=close_html, close_html=close_html,
section_name="environments" section_name="environments"
) )
}} }}
</div>
</div> </div>
{% call ToggleSection(section_name="environments") %} </div>
<ul> {% call ToggleSection(section_name="environments") %}
{% for environment_form in environment_roles_form %} <ul>
<li class="accordion-table__item__expanded"> {% for environment_form in environment_roles_form %}
{{ environment_form.environment_name.data }} <li class="accordion-table__item__expanded">
</li> {{ environment_form.environment_name.data }}
{% endfor %} </li>
</ul> {% endfor %}
{% endcall %} </ul>
{{ member_form.user_id() }} {% endcall %}
</li> {{ member_form.user_id() }}
</toggler> </li>
{% endfor %} </toggler>
</form> {% endfor %}

View File

@ -46,68 +46,68 @@
<section class="member-list application-list" id="application-members"> <section class="member-list application-list" id="application-members">
<base-form inline-template> <base-form inline-template>
<div class='responsive-table-wrapper panel'> <form method='POST' id="team" action='{{ url_for("applications.update_team", application_id=application.id) }}' autocomplete="off" enctype="multipart/form-data">
{% if g.matchesPath("application-members") %} <div class='responsive-table-wrapper panel'>
{% include "fragments/flash.html" %} {% if g.matchesPath("application-members") %}
{% endif %} {% include "fragments/flash.html" %}
<header> {% endif %}
<div class="responsive-table-wrapper__header"> <header>
<div class="responsive-table-wrapper__title row"> <div class="responsive-table-wrapper__header">
<div class="h3"> <div class="responsive-table-wrapper__title row">
{{ "portfolios.applications.team_settings.section.title" | translate({ "application_name": application.name }) }} <div class="h3">
{{ "portfolios.applications.team_settings.section.title" | translate({ "application_name": application.name }) }}
</div>
<a class="icon-link">
{{ Icon('info') }}
{{ "portfolios.admin.settings_info" | translate }}
</a>
</div> </div>
<a class="icon-link"> </header>
{{ Icon('info') }}
{{ "portfolios.admin.settings_info" | translate }}
</a>
</div>
</header>
<div class="accordion-table accordion-table-list"> <div class="accordion-table accordion-table-list">
<div class="accordion-table__head row"> <div class="accordion-table__head row">
<div class="col col--grow"> <div class="col col--grow">
{{ "common.name" | translate }} {{ "common.name" | translate }}
</div>
<div class="col col--grow">
{{ "portfolios.applications.team_settings.section.table.team_management" | translate }}
</div>
<div class="col col--grow">
{{ "portfolios.applications.team_settings.section.table.environment_management" | translate }}
</div>
<div class="col col--grow">
{{ "portfolios.applications.team_settings.section.table.delete_access" | translate }}
</div>
<div class="col col--grow">
&nbsp;
</div>
</div> </div>
<div class="col col--grow"> <ul class="accordion-table__items">
{{ "portfolios.applications.team_settings.section.table.team_management" | translate }} {% if user_can(permissions.EDIT_APPLICATION_MEMBER) %}
</div> {% include "fragments/applications/edit_team.html" %}
<div class="col col--grow"> {% elif user_can(permissions.VIEW_APPLICATION_MEMBER) %}
{{ "portfolios.applications.team_settings.section.table.environment_management" | translate }} {% include "fragments/applications/read_only_team.html" %}
</div> {% endif %}
<div class="col col--grow"> </ul>
{{ "portfolios.applications.team_settings.section.table.delete_access" | translate }} </div>
</div>
<div class="col col--grow"> <div class="panel__footer">
&nbsp; <div class="action-group save">
{% if user_can(permissions.EDIT_APPLICATION_MEMBER) %}
{{ SaveButton(text=('common.save' | translate), element="input", form="team") }}
{% endif %}
{% set new_member_modal_name = "add-app-mem" %}
{% if user_can(permissions.CREATE_APPLICATION_MEMBER) %}
<a class="icon-link modal-link" v-on:click="openModal('{{ new_member_modal_name }}')">
{{ "portfolios.admin.add_new_member" | translate }}
{{ Icon("plus") }}
</a>
{% endif %}
</div> </div>
</div> </div>
<ul class="accordion-table__items">
{% if user_can(permissions.EDIT_APPLICATION_MEMBER) %}
{% include "fragments/applications/edit_team.html" %}
{% elif user_can(permissions.VIEW_APPLICATION_MEMBER) %}
{% include "fragments/applications/read_only_team.html" %}
{% endif %}
</ul>
</div> </div>
</form>
<div class="panel__footer">
<div class="action-group save">
{% if user_can(permissions.EDIT_APPLICATION_MEMBER) %}
{{ SaveButton(text=('common.save' | translate), element="input", form="team") }}
{% endif %}
{% set new_member_modal_name = "add-app-mem" %}
{% if user_can(permissions.CREATE_APPLICATION_MEMBER) %}
<a class="icon-link modal-link" v-on:click="openModal('{{ new_member_modal_name }}')">
{{ "portfolios.admin.add_new_member" | translate }}
{{ Icon("plus") }}
</a>
{% endif %}
</div>
</div>
</div>
</base-form> </base-form>
{% if user_can(permissions.CREATE_APPLICATION_MEMBER) %} {% if user_can(permissions.CREATE_APPLICATION_MEMBER) %}
{% import "fragments/applications/new_member_modal_content.html" as member_steps %} {% import "fragments/applications/new_member_modal_content.html" as member_steps %}