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

Merge pull request #745 from dod-ccpo/delete-user-update

Browse Source 
Delete user update
This commit is contained in:
rachel-dtr 2019-04-05 14:02:37 -04:00 committed by GitHub
commit 40a4e205d9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 36 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
atst/utils/flash.py
View File

@ -29,9 +29,9 @@ MESSAGES = {
"category": "success",
},
"new_portfolio_member": {
"title_template": "Success!",
"title_template": translate("flash.success"),
"message_template": """
<p>You have successfully invited {{ new_member.user_name }} to the portfolio admin.</p>
<p>{{ "flash.new_portfolio_member" | translate({ "user_name": new_member.user_name }) }}</p>
""",
"category": "success",
},
@ -112,20 +112,18 @@ MESSAGES = {
"category": "success",
},
"task_order_congrats": {
"title_template": "Congrats!",
"message_template": """
You've created a new JEDI portfolio and jump started your first task order!
""",
"title_template": translate("flash.congrats"),
"message_template": translate("flash.new_portfolio"),
"actions": """
{% from "components/icon.html" import Icon %}
<div class='alert__actions'>
<a href='{{ url_for("portfolios.show_portfolio", portfolio_id=portfolio.id) }}' class='icon-link'>
{{ Icon('shield') }}
<span>Go to my Portfolio Home Page</span>
<span>{{ "flash.portfolio_home" | translate }}</span>
</a>
<a href='#next-steps' class='icon-link'>
{{ Icon('arrow-down') }}
<span>Review Next Steps Below</span>
<span>{{ "flash.next_steps" | translate }}</span>
</a>
</div>
""",
@ -139,8 +137,10 @@ MESSAGES = {
"category": "error",
},
"portfolio_member_removed": {
"title_template": "Portfolio Member Removed",
"message_template": "You have successfully removed {{ member_name }} from the portfolio.",
"title_template": translate("flash.deleted_member"),
"message_template": """
{{ "flash.delete_member_success" | translate({ "member_name": member_name }) }}
""",
"category": "success",
},
}

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

@ -26,7 +26,7 @@
</div>
{% if not portfolio.members %}
<p>There are currently no members in this Portfolio.</p>
<p>{{ "portfolios.admin.no_members" | translate }}</p>
{% else %}
<table>
@ -59,12 +59,12 @@
{% for member in portfolio.members %}
{% set modal_id = "portfolio_id_{}_user_id_{}".format(portfolio.id, member.user_id) %}
{% call Modal(name=modal_id, dismissable=False) %}
<h1>Are you sure you want to archive this user?</h1>
<h1>{{ "portfolios.admin.alert_header" | translate }}</h1>
{{
Alert(
title="Warning! You are about to archive a user from the portfolio admin.",
message="User will be removed from the portfolio, but their log history will be retained.",
title="portfolios.admin.alert_title" | translate,
message="portfolios.admin.alert_message" | translate,
level="warning"
)
}}
@ -76,7 +76,7 @@
{{ "portfolios.members.archive_button" | translate }}
</button>
</form>
<a v-on:click="closeModal('{{ modal_id }}')" class="action-group__action icon-link icon-link--default">Cancel</a>
<a v-on:click="closeModal('{{ modal_id }}')" class="action-group__action icon-link icon-link--default">{{ "common.cancel" | translate }}</a>
</div>
{% endcall %}
{% endfor %}
@ -89,7 +89,7 @@
type='submit'
form="member-perms"
class='usa-button usa-button-primary'
value='Save' />
value={{ "common.save" | translate }} />
{% endif %}
{% if user_can(permissions.CREATE_PORTFOLIO_USERS) %}
{% include "fragments/admin/add_new_portfolio_member.html" %}

25
translations.yaml
View File

@ -17,10 +17,21 @@ base_public:
header_title: JEDI Cloud
login: Log in
title_tag: JEDI Cloud
flash:
new_portfolio_member: You have successfully invited {user_name} to the portfolio.
success: Success!
congrats: Congrats!
new_portfolio: You've created a new JEDI portfolio and jump-started your first task order!
portfolio_home: Go to my portfolio home page
next_steps: Review next steps below
deleted_member: Portfolio member deleted
delete_member_success: You have successfully deleted {member_name} from the portfolio.
common:
back: Back
edit: Edit
manage: manage
cancel: Cancel
save: Save
save_and_continue: Save & Continue
sign: Sign
officer_helpers:
@ -305,9 +316,9 @@ fragments:
portfolio_admin:
none: Not Selected
ppoc:
title: Primary Point of Contact
subtitle: The PoC has the ability to edit all aspects of a portfolio.
update_btn: Update Primary PoC
title: Primary point of contact (PPoC)
subtitle: The PPoC has the ability to edit all aspects of a portfolio and is the only one who can manage the PPoC role.
update_btn: Update
login:
ccpo_logo_alt_text: Cloud Computing Program Office Logo
certificate_selection:
@ -563,15 +574,19 @@ portfolios:
title: '{application_name} Team Management'
subheading: Team Management
admin:
portfolio_members_title: Portfolio Members
portfolio_members_title: Portfolio members
portfolio_members_subheading: These members have different levels of access to the portfolio.
settings_info: Learn more about these settings
add_member: Add a new member
permissions_info: Learn more about these permissions
activity_log_title: Activity log
add_new_member: Add a new member
alert_header: Are you sure you want to delete this member?
alert_title: Warning! You are about to delete a member from the portfolio.
alert_message: The member will be removed from the portfolio, but their log history will be retained.
no_members: There are currently no members in this portfolio.
members:
archive_button: Archive user
archive_button: Delete member
permissions:
name: Name
app_mgmt: App management