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

Add resend invite form/modal, update routes and tests as necessary.

Browse Source
This commit is contained in:
leigh-mil
2020-01-07 16:54:50 -05:00
parent 56c213285f
commit 4f345b462f
5 changed files with 90 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
atst/routes/portfolios/admin.py
View File

@@ -38,20 +38,35 @@ def filter_perm_sets_data(member):
return perm_sets_data
def filter_members_data(members_list, portfolio):
def filter_members_data(members_list):
members_data = []
for member in members_list:
permission_sets = filter_perm_sets_data(member)
members_data.append(
{
"role_id": member.id,
"user_name": member.user_name,
"permission_sets": filter_perm_sets_data(member),
"status": member.display_status,
"ppoc": PermissionSets.PORTFOLIO_POC in member.permission_sets,
"form": member_forms.PermissionsForm(permission_sets),
}
)
ppoc = PermissionSets.PORTFOLIO_POC in member.permission_sets
member_data = {
"role_id": member.id,
"user_name": member.user_name,
"permission_sets": filter_perm_sets_data(member),
"status": member.display_status,
"ppoc": ppoc,
"form": member_forms.PermissionsForm(permission_sets),
}
if not ppoc:
update_invite_form = (
member_forms.NewForm(user_data=member.latest_invitation)
if member.latest_invitation and member.latest_invitation.can_resend
else member_forms.NewForm()
)
invite_token = (
member.latest_invitation.token
if member.latest_invitation and member.latest_invitation.can_resend
else None
)
member_data["update_invite_form"] = update_invite_form
member_data["invite_token"] = invite_token
members_data.append(member_data)
return sorted(members_data, key=lambda member: member["user_name"])
@@ -76,7 +91,7 @@ def render_admin_page(portfolio, form=None):
"portfolios/admin.html",
form=form,
portfolio_form=portfolio_form,
members=filter_members_data(member_list, portfolio),
members=filter_members_data(member_list),
new_manager_form=member_forms.NewForm(),
assign_ppoc_form=assign_ppoc_form,
portfolio=portfolio,

25
atst/routes/portfolios/invitations.py
View File

@@ -54,13 +54,24 @@ def revoke_invitation(portfolio_id, portfolio_token):
)
@user_can(Permissions.EDIT_PORTFOLIO_USERS, message="resend invitation")
def resend_invitation(portfolio_id, portfolio_token):
invite = PortfolioInvitations.resend(g.current_user, portfolio_token)
send_portfolio_invitation(
invitee_email=invite.email,
inviter_name=g.current_user.full_name,
token=invite.token,
)
flash("resend_portfolio_invitation", user_name=invite.user_name)
form = member_forms.NewForm(http_request.form)
if form.validate():
invite = PortfolioInvitations.resend(
g.current_user, portfolio_token, form.data["user_data"]
)
send_portfolio_invitation(
invitee_email=invite.email,
inviter_name=g.current_user.full_name,
token=invite.token,
)
flash("resend_portfolio_invitation", user_name=invite.user_name)
else:
user_name = "{} {}".format(
form["user_data"]["first_name"].data, form["user_data"]["last_name"].data
)
flash("resend_portfolio_invitation_error", user_name=user_name)
return redirect(
url_for(
"portfolios.admin",