Get changes working with merged PRs
This commit is contained in:
parent
bcfc8ee8e1
commit
83b071bf20
@ -177,18 +177,16 @@ def portfolio_reports(portfolio_id):
|
|||||||
|
|
||||||
|
|
||||||
@portfolios_bp.route(
|
@portfolios_bp.route(
|
||||||
"/portfolios/<portfolio_id>/members/<member_id>/delete", methods=["POST"]
|
"/portfolios/<portfolio_id>/members/<user_id>/delete", methods=["POST"]
|
||||||
)
|
)
|
||||||
@user_can(Permissions.EDIT_PORTFOLIO_USERS, message="update portfolio members")
|
@user_can(Permissions.EDIT_PORTFOLIO_USERS, message="update portfolio members")
|
||||||
def remove_member(portfolio_id, member_id):
|
def remove_member(portfolio_id, user_id):
|
||||||
if member_id == str(g.current_user.id):
|
if str(g.current_user.id) == user_id:
|
||||||
raise UnauthorizedError(
|
raise UnauthorizedError(
|
||||||
user=g.current_user, action="you cant remove yourself from the portfolio"
|
g.current_user, "you cant remove yourself from the portfolio"
|
||||||
)
|
)
|
||||||
|
|
||||||
portfolio = Portfolios.get(g.current_user, portfolio_id)
|
portfolio_role = PortfolioRoles.get(portfolio_id=portfolio_id, user_id=user_id)
|
||||||
portfolio_role = PortfolioRoles.get(portfolio_id=portfolio_id, user_id=member_id)
|
|
||||||
|
|
||||||
PortfolioRoles.disable(portfolio_role=portfolio_role)
|
PortfolioRoles.disable(portfolio_role=portfolio_role)
|
||||||
|
|
||||||
flash("portfolio_member_removed", member_name=portfolio_role.user.full_name)
|
flash("portfolio_member_removed", member_name=portfolio_role.user.full_name)
|
||||||
@ -196,7 +194,7 @@ def remove_member(portfolio_id, member_id):
|
|||||||
return redirect(
|
return redirect(
|
||||||
url_for(
|
url_for(
|
||||||
"portfolios.portfolio_admin",
|
"portfolios.portfolio_admin",
|
||||||
portfolio_id=portfolio.id,
|
portfolio_id=portfolio_id,
|
||||||
_anchor="portfolio-members",
|
_anchor="portfolio-members",
|
||||||
fragment="portfolio-members",
|
fragment="portfolio-members",
|
||||||
)
|
)
|
||||||
|
@ -1,8 +1,8 @@
|
|||||||
{% from "components/confirmation_button.html" import ConfirmationButton %}
|
{% from "components/confirmation_button.html" import ConfirmationButton %}
|
||||||
|
|
||||||
{% set modal_id = "portfolio_id_{}_user_id_{}".format(portfolio.id, user.id) %}
|
|
||||||
|
|
||||||
{% for subform in member_perms_form.members_permissions %}
|
{% for subform in member_perms_form.members_permissions %}
|
||||||
|
{% set modal_id = "portfolio_id_{}_user_id_{}".format(portfolio.id, subform.user_id.data) %}
|
||||||
|
|
||||||
<tr>
|
<tr>
|
||||||
<td class='name'>{{ subform.member.data }}
|
<td class='name'>{{ subform.member.data }}
|
||||||
{% if subform.member.data == user.full_name %}
|
{% if subform.member.data == user.full_name %}
|
||||||
|
@ -70,7 +70,7 @@
|
|||||||
}}
|
}}
|
||||||
|
|
||||||
<div class="action-group">
|
<div class="action-group">
|
||||||
<form method="POST" action="{{ url_for('portfolios.remove_member', portfolio_id=portfolio.id, member_id=member.user_id) }}">
|
<form method="POST" action="{{ url_for('portfolios.remove_member', portfolio_id=portfolio.id, user_id=member.user_id) }}">
|
||||||
{{ member_perms_form.csrf_token }}
|
{{ member_perms_form.csrf_token }}
|
||||||
<button class="usa-button usa-button-danger">
|
<button class="usa-button usa-button-danger">
|
||||||
{{ "portfolios.members.archive_button" | translate }}
|
{{ "portfolios.members.archive_button" | translate }}
|
||||||
|
@ -92,9 +92,7 @@ def test_remove_portfolio_member(client, user_session):
|
|||||||
user_session(portfolio.owner)
|
user_session(portfolio.owner)
|
||||||
|
|
||||||
response = client.post(
|
response = client.post(
|
||||||
url_for(
|
url_for("portfolios.remove_member", portfolio_id=portfolio.id, user_id=user.id),
|
||||||
"portfolios.remove_member", portfolio_id=portfolio.id, member_id=user.id
|
|
||||||
),
|
|
||||||
follow_redirects=False,
|
follow_redirects=False,
|
||||||
)
|
)
|
||||||
|
|
||||||
@ -121,7 +119,7 @@ def test_remove_portfolio_member_self(client, user_session):
|
|||||||
url_for(
|
url_for(
|
||||||
"portfolios.remove_member",
|
"portfolios.remove_member",
|
||||||
portfolio_id=portfolio.id,
|
portfolio_id=portfolio.id,
|
||||||
member_id=portfolio.owner.id,
|
user_id=portfolio.owner.id,
|
||||||
),
|
),
|
||||||
follow_redirects=False,
|
follow_redirects=False,
|
||||||
)
|
)
|
||||||
|
Loading…
x
Reference in New Issue
Block a user