zydronium/manage.get.gov
1
0
Fork 0
mirror of https://github.com/cisagov/manage.get.gov.git synced 2025-08-02 16:02:15 +02:00
Code Issues Projects Releases Packages Wiki Activity

pass in portfolio

Browse source
This commit is contained in:
zandercymatics 2024-10-01 15:33:26 -06:00
parent 7b09b35bf4
commit 72afa032ed
No known key found for this signature in database
GPG key ID: FF4636ABEC9682B7
2 changed files with 7 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/registrar/templates/includes/members_table.html
View file

@ -1,5 +1,7 @@
{% load static %}
<!-- Embedding the portfolio value in a data attribute -->
<span id="portfolio-js-value" class="display-none" data-portfolio="{{ portfolio.id }}"></span>
{% comment %} Stores the json endpoint in a url for easier access {% endcomment %}
{% url 'get_portfolio_members_json' as url %}
<span id="get_members_json_url" class="display-none">{{url}}</span>

14
src/registrar/views/portfolio_members_json.py
View file

@ -13,11 +13,10 @@ from registrar.models.utility.portfolio_helper import UserPortfolioRoleChoices
def get_portfolio_members_json(request):
"""Given the current request,
get all members that are associated with the given portfolio"""
member_ids = get_member_ids_from_request(request)
portfolio = request.GET.get("portfolio")
member_ids = get_member_ids_from_request(request, portfolio)
objects = User.objects.filter(id__in=member_ids)
portfolio = request.session.get("portfolio")
admin_ids = UserPortfolioPermission.objects.filter(
portfolio=portfolio,
roles__overlap=[
@ -38,7 +37,7 @@ def get_portfolio_members_json(request):
page_number = request.GET.get("page", 1)
page_obj = paginator.get_page(page_number)
members = [
serialize_members(request, member, request.user, admin_ids, portfolio_invitation_emails)
serialize_members(request, portfolio, member, request.user, admin_ids, portfolio_invitation_emails)
for member in page_obj.object_list
]
@ -55,10 +54,9 @@ def get_portfolio_members_json(request):
)
def get_member_ids_from_request(request):
def get_member_ids_from_request(request, portfolio):
"""Given the current request,
get all members that are associated with the given portfolio"""
portfolio = request.session.get("portfolio")
member_ids = []
if portfolio:
member_ids = UserPortfolioPermission.objects.filter(portfolio=portfolio).values_list("user__id", flat=True)
@ -87,9 +85,7 @@ def apply_sorting(queryset, request):
return queryset.order_by(sort_by)
def serialize_members(request, member, user, admin_ids, portfolio_invitation_emails):
portfolio = request.session.get("portfolio")
def serialize_members(request, portfolio, member, user, admin_ids, portfolio_invitation_emails):
# ------- VIEW ONLY
# If not view_only (the user has permissions to edit/manage users), show the gear icon with "Manage" link.
# If view_only (the user only has view user permissions), show the "View" link (no gear icon).