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

Use generalized macro for new member form in application settings

Browse Source
This commit is contained in:
leigh-mil
2019-12-26 13:07:15 -05:00
parent 6e50a8cc1f
commit 4d2a175136
2 changed files with 13 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
templates/applications/fragments/members.html
View File

@@ -1,12 +1,10 @@
{% from "components/alert.html" import Alert %}
{% from "components/icon.html" import Icon %} {% from "components/icon.html" import Icon %}
{% from "components/label.html" import Label %} {% from "components/label.html" import Label %}
{% import "applications/fragments/new_member_modal_content.html" as member_steps %} {% import "components/member_form_template.html" as member_form %}
{% import "applications/fragments/member_form_fields.html" as member_fields %} {% import "applications/fragments/member_form_fields.html" as member_fields %}
{% from "components/modal.html" import Modal %} {% from "components/modal.html" import Modal %}
{% from "components/multi_step_modal_form.html" import MultiStepModalForm %} {% from "components/multi_step_modal_form.html" import MultiStepModalForm %}
{% from "components/save_button.html" import SaveButton %} {% from "components/save_button.html" import SaveButton %}
{% from "components/toggle_list.html" import ToggleButton, ToggleSection %}
{% macro MemberManagementTemplate( {% macro MemberManagementTemplate(
application, application,
@@ -179,8 +177,18 @@
form=new_member_form, form=new_member_form,
form_action=url_for(action_new, application_id=application.id), form_action=url_for(action_new, application_id=application.id),
steps=[ steps=[
member_steps.MemberStepOne(new_member_form), member_form.BasicStep(
member_steps.MemberStepTwo(new_member_form, application) title="portfolios.applications.members.form.add_member"|translate,
form=member_fields.InfoFields(new_member_form.user_data),
next_button_text="portfolios.applications.members.form.next_button"|translate,
previous=False,
modal=new_member_modal_name,
),
member_form.SubmitStep(
form=member_fields.PermsFields(form=new_member_form, new=True),
submit_text="portfolios.applications.members.form.add_member"|translate,
modal=new_member_modal_name,
)
], ],
) }} ) }}
{% endif %} {% endif %}

33
templates/applications/fragments/new_member_modal_content.html
View File

@@ -1,33 +0,0 @@
{% from "components/icon.html" import Icon %}
{% from "components/member_form_template.html" import MemberFormTemplate %}
{% import "applications/fragments/member_form_fields.html" as member_fields %}
{% macro MemberStepOne(member_form) %}
{% set next_button %}
<input
type='button'
v-on:click="next()"
v-bind:disabled="!canSave"
class='action-group__action usa-button'
value='{{ "portfolios.applications.members.form.next_button" | translate }}'>
{% endset %}
{% call MemberFormTemplate(title="portfolios.applications.members.form.add_member"|translate, next_button=next_button, previous=False) %}
{{ member_fields.InfoFields(member_form.user_data) }}
{% endcall %}
{% endmacro %}
{% macro MemberStepTwo(member_form, application) %}
{% set next_button %}
<input
type="submit"
class='action-group__action usa-button'
form="add-app-mem"
v-bind:disabled="!canSave"
value='{{ "portfolios.applications.members.form.add_member" | translate}}'>
{% endset %}
{% call MemberFormTemplate(next_button=next_button) %}
{{ member_fields.PermsFields(form=member_form, new=True) }}
{% endcall %}
{% endmacro %}