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

Merge pull request #1145 from dod-ccpo/bugfix/disallow-resent-invite-with-invalid-date

Browse Source 
Allow submit buttons to be valid on initial render
This commit is contained in:
dandds 2019-10-30 16:15:13 -04:00 committed by GitHub
commit 06239c94ba
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -62,7 +62,7 @@
{{ member.update_invite_form.csrf_token }} {{ member.update_invite_form.csrf_token }}
{{ member_fields.InfoFields(member.update_invite_form) }} {{ member_fields.InfoFields(member.update_invite_form) }}
<div class="action-group"> <div class="action-group">
<input type="submit" class="usa-button usa-button-primary action-group__action" tabindex="0" value="Resend Invite" /> {{ SaveButton(text="Resend Invite", disable_on_initial_render=False)}}
<a class='action-group__action' v-on:click="closeModal('{{ resend_invite_modal }}')">{{ "common.cancel" | translate }}</a> <a class='action-group__action' v-on:click="closeModal('{{ resend_invite_modal }}')">{{ "common.cancel" | translate }}</a>
</div> </div>
</form> </form>

8
templates/components/save_button.html
View File

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