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

Merge pull request #765 from dod-ccpo/fix-add-member-modal

Browse Source 
Fix add member form
This commit is contained in:
leigh-mil 2019-04-16 14:20:10 -04:00 committed by GitHub
commit 999287b12a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
js/components/forms/base_form.js
View File

@ -22,5 +22,5 @@ export default {
levelofwarrant, levelofwarrant,
Modal, Modal,
}, },
mixins: [FormMixin, Modal], mixins: [FormMixin],
} }

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

@ -57,22 +57,22 @@
</table> </table>
</div> </div>
<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>
{% endif %} {% endif %}
</form> </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 %}
{% set modal_id = "portfolio_id_{}_user_id_{}".format(portfolio.id, member.user_id) %} {% set modal_id = "portfolio_id_{}_user_id_{}".format(portfolio.id, member.user_id) %}