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

Add save button and temp member role toggle to env member form

Browse Source
This commit is contained in:
leigh-mil
2019-05-01 13:52:49 -04:00
parent aab01b3947
commit 060c6834bf
12 changed files with 148 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
templates/components/toggle_list.html
View File

@@ -9,8 +9,8 @@
</span>
{% endmacro %}
{% macro ToggleSection(section_name) %}
<div v-show="selectedSection === '{{ section_name }}'">
{% macro ToggleSection(section_name, classes) %}
<div v-show="selectedSection === '{{ section_name }}'" class='{{ classes }}'>
{{ caller() }}
</div>
{% endmacro %}

55
templates/fragments/applications/edit_environments.html
View File

@@ -1,11 +1,12 @@
{% from "components/delete_confirmation.html" import DeleteConfirmation %}
{% from "components/icon.html" import Icon %}
{% from "components/modal.html" import Modal %}
{% from "components/options_input.html" import OptionsInput %}
{% from "components/save_button.html" import SaveButton %}
{% from "components/text_input.html" import TextInput %}
{% from "components/toggle_list.html" import ToggleButton, ToggleSection %}
{% macro RolePanel(users=[], role='no_access') %}
{% macro RolePanel(users=[], role='no_access', members_form=[]) %}
{% if role == 'no_access' %}
{% set role = 'Unassigned (No Access)' %}
{% set unassigned = True %}
@@ -15,8 +16,31 @@
<h4>{{ role }}</h4>
<ul class='environment-role__users'>
{% for user in users %}
{% set section_name = "env_member_{}".format(user.user_id) %}
<li class="environment-role__user {{ 'unassigned' if unassigned }}">
{{ user.name }}{{ Icon('edit', classes="icon--medium right") }}
{{ user.name }}
<span class="icon-link right">
{% set edit_env_members_button %}
{{ Icon('edit', classes="icon--medium") }}
{% endset %}
{{
ToggleButton(
open_html=edit_env_members_button,
close_html=edit_env_members_button,
section_name=section_name
)
}}
</span>
{% call ToggleSection(section_name=section_name, classes="environment-role__user-field") %}
{% for member in members_form %}
{% if member.user_id.data == user.user_id %}
{{ OptionsInput(member.role, label=False) }}
{{ member.user_id() }}
{% endif %}
{% endfor %}
{% endcall %}
</li>
{% endfor %}
@@ -101,11 +125,30 @@
</div>
</div>
{% call ToggleSection(section_name="members") %}
{% call ToggleSection(section_name="members", classes="environment-roles") %}
<div class='app-team-settings-link'>Need to add someone new to the team? <a href='{{ url_for("applications.team", application_id=application.id) }}'>Jump to Team Settings</a></div>
{% for role, members in members_by_role.items() %}
{{ RolePanel(users=members, role=role) }}
{% endfor %}
<toggler inline-template>
{% set members_form = env['members_form'] %}
<form action="{{ url_for('applications.update_env_roles', environment_id=env['id']) }}" method="post">
{{ members_form.csrf_token }}
{% for role, members in members_by_role.items() %}
{{ RolePanel(users=members, role=role, members_form=env['members_form']['team_roles']) }}
{% endfor %}
{{ env['members_form'].env_id() }}
<div class='action-group'>
{{
SaveButton(
text=("portfolios.applications.update_button_text" | translate)
)
}}
</div>
</form>
</toggler>
<div class='action-group-cancel'>
<a class='action-group-cancel__action icon-link icon-link--default' v-on:click="toggleSection('members')">
{{ "common.cancel" | translate }}
</a>
</div>
{% endcall %}
{% call ToggleSection(section_name="edit") %}