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

resolve merge issues

Browse source
This commit is contained in:
Rachid Mrad 2024-07-22 15:48:53 -04:00
parent faddfcec50
commit 58db599d60
No known key found for this signature in database
3 changed files with 6 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/registrar/registrar_middleware.py
View file

@ -143,7 +143,7 @@ class CheckPortfolioMiddleware:
if current_path == self.home and request.user.is_authenticated and request.user.is_org_user(request):
if request.user.has_base_portfolio_permission():
portfolio = request.user.portfolio0
portfolio = request.user.portfolio
# Add the portfolio to the request object
request.portfolio = portfolio

7
src/registrar/templates/includes/header_extended.html
View file

@ -14,7 +14,7 @@
<ul class="usa-nav__primary usa-accordion">
{% if has_domains_portfolio_permission %}
<li class="usa-nav__primary-item">
{% url 'portfolio-domains' portfolio.id as url %}
{% url 'portfolio-domains' portfolio.id as url %}
<a href="{{ url }}" class="usa-nav-link{% if request.path == url %} usa-current{% endif %}">
Domains
</a>
@ -27,7 +27,7 @@
</li>
{% if has_domain_requests_portfolio_permission %}
<li class="usa-nav__primary-item">
{% url 'portfolio-domain-requests' portfolio.id as url %}
{% url 'portfolio-domain-requests' portfolio.id as url %}
<a href="{{ url }}" class="usa-nav-link{% if request.path == url %} usa-current{% endif %}">
Domain requests
</a>
@ -39,8 +39,9 @@
</a>
</li>
<li class="usa-nav__primary-item">
{% url 'portfolio-organization' portfolio.id as url %}
<!-- Move the padding from the a to the span so that the descenders do not get cut off -->
<a href="#" class="usa-nav-link padding-y-0">
<a href="{{ url }}" class="usa-nav-link padding-y-0">
<span class="ellipsis ellipsis--23 ellipsis--desktop-50 padding-y-1 desktop:padding-y-2">
{{ portfolio.organization_name }}
</span>

2
src/registrar/templates/portfolio_organization.html
View file

@ -1,4 +1,4 @@
{% extends 'portfolio.html' %}
{% extends 'portfolio_base.html' %}
{% load static %}