From 30d1e9a06d5bff2f1b34bccd4d4d205f44c02895 Mon Sep 17 00:00:00 2001 From: David Kennedy Date: Fri, 4 Oct 2024 12:21:18 -0400 Subject: [PATCH] added simple page header info --- src/registrar/templates/portfolio_member.html | 43 +++++++++++++++++-- src/registrar/views/portfolios.py | 5 ++- 2 files changed, 42 insertions(+), 6 deletions(-) diff --git a/src/registrar/templates/portfolio_member.html b/src/registrar/templates/portfolio_member.html index 284a795eb..557e3b480 100644 --- a/src/registrar/templates/portfolio_member.html +++ b/src/registrar/templates/portfolio_member.html @@ -13,9 +13,46 @@ {% include "includes/form_messages.html" %} {% endblock %} -

Member

+

Manage member

+ +

+ {% if member %} + {{ member.email }} + {% elif invitation %} + {{ invitation.email }} + {% endif %} +

-

{{ member.first_name }}

+

Last active: + {% if member and member.last_login %} + {{ member.last_login }} + {% elif invitation %} + Invited + {% else %} + -- + {% endif %} +

+ +

Full name: + {% if member %} + {% if member.first_name or member.last_name %} + {{ member.get_formatted_name }} + {% else %} + -- + {% endif %} + {% else %} + -- + {% endif %} +

+ +

Title or organization role: + {% if member and member.title %} + {{ member.title }} + {% else %} + -- + {% endif %} +

+
@@ -23,11 +60,9 @@
{% csrf_token %} {% if form.roles %} - {% comment - handling form fields for member %} {% input_with_errors form.roles %} {% input_with_errors form.additional_permissions %} {% elif form.portfolio_roles %} - {% comment - handling form fields for invited member %} {% input_with_errors form.portfolio_roles %} {% input_with_errors form.portfolio_additional_permissions %} {% endif %} diff --git a/src/registrar/views/portfolios.py b/src/registrar/views/portfolios.py index 56af5897e..98402fb95 100644 --- a/src/registrar/views/portfolios.py +++ b/src/registrar/views/portfolios.py @@ -95,9 +95,10 @@ class PortfolioInvitedMemberView(PortfolioInvitedMemberPermissionView, View): def get(self, request, pk): portfolio_invitation = get_object_or_404(PortfolioInvitation, pk=pk) form = self.form_class(instance=portfolio_invitation) + return render(request, self.template_name, { 'form': form, - 'member': None, + 'invitation': portfolio_invitation, }) def post(self, request, pk): @@ -109,7 +110,7 @@ class PortfolioInvitedMemberView(PortfolioInvitedMemberPermissionView, View): return render(request, self.template_name, { 'form': form, - 'member': None, # Pass the user object again to the template + 'invitation': portfolio_invitation, # Pass the user object again to the template })