diff --git a/src/registrar/decorators.py b/src/registrar/decorators.py index aa16e91f5..714e375c4 100644 --- a/src/registrar/decorators.py +++ b/src/registrar/decorators.py @@ -167,7 +167,7 @@ def _user_has_permission(user, request, rules, **kwargs): # TODO -- fix this on all related URLS :( and ( _member_exists_under_portfolio(portfolio, kwargs.get("member_pk")) - or _member_invitation_exists_under_portfolio(portfolio, kwargs.get("memberinvitation_pk")) + or _member_invitation_exists_under_portfolio(portfolio, kwargs.get("invitedmember_pk")) ), ), ] @@ -213,8 +213,8 @@ def _domain_request_exists_under_portfolio(portfolio, domain_request_pk): def _member_exists_under_portfolio(portfolio, member_pk): return UserPortfolioPermission.objects.filter(portfolio=portfolio, id=member_pk).exists() -def _member_invitation_exists_under_portfolio(portfolio, memberinvitation_pk): - return PortfolioInvitation.objects.filter(portfolio=portfolio, id=memberinvitation_pk).exists() +def _member_invitation_exists_under_portfolio(portfolio, invitedmember_pk): + return PortfolioInvitation.objects.filter(portfolio=portfolio, id=invitedmember_pk).exists() def _is_domain_request_creator(user, domain_request_pk): """Checks to see if the user is the creator of a domain request diff --git a/src/registrar/templates/includes/member_domains_edit_table.html b/src/registrar/templates/includes/member_domains_edit_table.html index a76f711cc..1d706f89a 100644 --- a/src/registrar/templates/includes/member_domains_edit_table.html +++ b/src/registrar/templates/includes/member_domains_edit_table.html @@ -91,9 +91,9 @@ aria-describedby="You have unsaved changes that will be lost." > {% if portfolio_permission %} - {% url 'member-domains' pk=portfolio_permission.id as url %} + {% url 'member-domains' member_pk=portfolio_permission.id as url %} {% else %} - {% url 'invitedmember-domains' pk=portfolio_invitation.id as url %} + {% url 'invitedmember-domains' invitedmember_pk=portfolio_invitation.id as url %} {% endif %} {% include 'includes/modal.html' with modal_heading="Are you sure you want to continue?" modal_description="You have unsaved changes that will be lost." modal_button_url=url modal_button_text="Continue without saving" %} diff --git a/src/registrar/templates/portfolio_member_domains.html b/src/registrar/templates/portfolio_member_domains.html index 76d48c20b..677539585 100644 --- a/src/registrar/templates/portfolio_member_domains.html +++ b/src/registrar/templates/portfolio_member_domains.html @@ -15,11 +15,11 @@ {% url 'members' as url %} {% if portfolio_permission %} - {% url 'member' pk=portfolio_permission.id as url2 %} - {% url 'member-domains-edit' pk=portfolio_permission.id as url3 %} + {% url 'member' member_pk=portfolio_permission.id as url2 %} + {% url 'member-domains-edit' member_pk=portfolio_permission.id as url3 %} {% else %} - {% url 'invitedmember' pk=portfolio_invitation.id as url2 %} - {% url 'invitedmember-domains-edit' pk=portfolio_invitation.id as url3 %} + {% url 'invitedmember' invitedmember_pk=portfolio_invitation.id as url2 %} + {% url 'invitedmember-domains-edit' invitedmember_pk=portfolio_invitation.id as url3 %} {% endif %}