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

Merge pull request #768 from dod-ccpo/delete-member-modal-fix

Browse Source 
Fix issue where closing modals freezed the page
This commit is contained in:
leigh-mil 2019-04-16 16:04:12 -04:00 committed by GitHub
commit 1b12ab0fb0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 55 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

116
templates/fragments/admin/portfolio_members.html
View File

@ -6,76 +6,71 @@
{% from "components/alert.html" import Alert %} {% from "components/alert.html" import Alert %}
<section class="member-list" id="portfolio-members"> <section class="member-list" id="portfolio-members">
<div class='responsive-table-wrapper panel accordion-table'> <base-form inline-template>
<div class='responsive-table-wrapper panel accordion-table'>
{% if g.matchesPath("portfolio-members") %} {% if g.matchesPath("portfolio-members") %}
{% include "fragments/flash.html" %} {% include "fragments/flash.html" %}
{% endif %} {% endif %}
<base-form inline-template> <form method='POST' id="member-perms" action='{{ url_for("portfolios.edit_portfolio_members", portfolio_id=portfolio.id) }}' autocomplete="off" enctype="multipart/form-data">
<div> {{ member_perms_form.csrf_token }}
<form method='POST' id="member-perms" action='{{ url_for("portfolios.edit_portfolio_members", portfolio_id=portfolio.id) }}' autocomplete="off" enctype="multipart/form-data">
{{ member_perms_form.csrf_token }}
<div class='application-list-item'> <div class='application-list-item'>
<header> <header>
<div class='responsive-table-wrapper__header'> <div class='responsive-table-wrapper__header'>
<div class='responsive-table-wrapper__title'> <div class='responsive-table-wrapper__title'>
<div class='h3'>{{ "portfolios.admin.portfolio_members_title" | translate }}</div> <div class='h3'>{{ "portfolios.admin.portfolio_members_title" | translate }}</div>
<div class='subheading'> <div class='subheading'>
{{ "portfolios.admin.portfolio_members_subheading" | translate }} {{ "portfolios.admin.portfolio_members_subheading" | translate }}
</div>
</div> </div>
<a class='icon-link'>
{{ Icon('info') }}
{{ "portfolios.admin.settings_info" | translate }}
</a>
</div> </div>
</header>
{% if not portfolio.members %} <a class='icon-link'>
<p>{{ "portfolios.admin.no_members" | translate }}</p> {{ Icon('info') }}
{% else %} {{ "portfolios.admin.settings_info" | translate }}
<table> </a>
<thead>
<tr>
<td>{{ "portfolios.members.permissions.name" | translate }}</td>
<td>{{ "portfolios.members.permissions.app_mgmt" | translate }}</td>
<td>{{ "portfolios.members.permissions.funding" | translate }}</td>
<td>{{ "portfolios.members.permissions.reporting" | translate }}</td>
<td>{{ "portfolios.members.permissions.portfolio_mgmt" | translate }}</td>
<td></td>
</tr>
</thead>
<tbody>
{% if user_can(permissions.EDIT_PORTFOLIO_USERS) %}
{% include "fragments/admin/members_edit.html" %}
{% elif user_can(permissions.VIEW_PORTFOLIO_USERS) %}
{% include "fragments/admin/members_view.html" %}
{% endif %}
</tbody>
</table>
</div> </div>
{% endif %} </header>
</form>
<div class="panel__footer"> {% if not portfolio.members %}
<div class="action-group save"> <p>{{ "portfolios.admin.no_members" | translate }}</p>
{% if user_can(permissions.EDIT_PORTFOLIO_USERS) %} {% else %}
{{ SaveButton(text=('common.save' | translate), element="input", form="member-perms") }} <table>
{% endif %}
{% if user_can(permissions.CREATE_PORTFOLIO_USERS) %} <thead>
{% include "fragments/admin/add_new_portfolio_member.html" %} <tr>
{% endif %} <td>{{ "portfolios.members.permissions.name" | translate }}</td>
</div> <td>{{ "portfolios.members.permissions.app_mgmt" | translate }}</td>
<td>{{ "portfolios.members.permissions.funding" | translate }}</td>
<td>{{ "portfolios.members.permissions.reporting" | translate }}</td>
<td>{{ "portfolios.members.permissions.portfolio_mgmt" | translate }}</td>
<td></td>
</tr>
</thead>
<tbody>
{% if user_can(permissions.EDIT_PORTFOLIO_USERS) %}
{% include "fragments/admin/members_edit.html" %}
{% elif user_can(permissions.VIEW_PORTFOLIO_USERS) %}
{% include "fragments/admin/members_view.html" %}
{% endif %}
</tbody>
</table>
</div>
{% endif %}
</form>
<div class="panel__footer">
<div class="action-group save">
{% if user_can(permissions.EDIT_PORTFOLIO_USERS) %}
{{ SaveButton(text=('common.save' | translate), element="input", form="member-perms") }}
{% endif %}
{% if user_can(permissions.CREATE_PORTFOLIO_USERS) %}
{% include "fragments/admin/add_new_portfolio_member.html" %}
{% endif %}
</div> </div>
</div> </div>
</base-form>
{% if user_can(permissions.EDIT_PORTFOLIO_USERS) %} {% if user_can(permissions.EDIT_PORTFOLIO_USERS) %}
{% for member in portfolio.members %} {% for member in portfolio.members %}
@ -105,7 +100,6 @@
{% endcall %} {% endcall %}
{% endfor %} {% endfor %}
{% endif %} {% endif %}
</div>
</div> </base-form>
</section> </section>