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

Merge pull request #767 from dod-ccpo/fix-port-members-again

Browse Source 
Actually fix the issue with the new member form and the save button
This commit is contained in:
leigh-mil 2019-04-16 15:05:48 -04:00 committed by GitHub
commit b454efcfcc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 54 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -11,67 +11,71 @@
{% include "fragments/flash.html" %} {% include "fragments/flash.html" %}
{% endif %} {% endif %}
<base-form inline-template> <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>
<a class='icon-link'> {% if not portfolio.members %}
{{ Icon('info') }} <p>{{ "portfolios.admin.no_members" | translate }}</p>
{{ "portfolios.admin.settings_info" | translate }} {% else %}
</a> <table>
<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>
</header> {% endif %}
</form>
{% if not portfolio.members %} <div class="panel__footer">
<p>{{ "portfolios.admin.no_members" | translate }}</p> <div class="action-group save">
{% else %} {% if user_can(permissions.EDIT_PORTFOLIO_USERS) %}
<table> {{ SaveButton(text=('common.save' | translate), element="input", form="member-perms") }}
{% endif %}
<thead> {% if user_can(permissions.CREATE_PORTFOLIO_USERS) %}
<tr> {% include "fragments/admin/add_new_portfolio_member.html" %}
<td>{{ "portfolios.members.permissions.name" | translate }}</td> {% endif %}
<td>{{ "portfolios.members.permissions.app_mgmt" | translate }}</td> </div>
<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 %} </div>
</form>
</base-form> </base-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>
{% if user_can(permissions.EDIT_PORTFOLIO_USERS) %} {% if user_can(permissions.EDIT_PORTFOLIO_USERS) %}
{% for member in portfolio.members %} {% for member in portfolio.members %}