Skip to content

Commit eb8afd5

Browse files
authored
Merge pull request #1230 from thunderstore-io/nav-to-team-settings-if-no-team
Fix user nav linking to unowned pages
2 parents f2e70d9 + 884acf5 commit eb8afd5

File tree

2 files changed

+7
-4
lines changed

2 files changed

+7
-4
lines changed

django/thunderstore/frontend/templates/base.html

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,11 @@ <h6 class="title">Popular communities</h6>
8888
{% dynamic_html "nav_bar_right_nav" %}
8989
{% if request.user.is_authenticated %}
9090
<li class="nav-item">
91-
<a href="{% community_url 'packages.list_by_owner' owner=team %}" class="nav-link text-dark">{{ request.user.username }}</a>
91+
{% if team %}
92+
<a title="View packages uploaded by your first team" href="{% community_url 'packages.list_by_owner' owner=team %}" class="nav-link text-dark">{{ request.user.username }}</a>
93+
{% else %}
94+
<a title="Open team settings" href="{% url "settings.teams" %}" class="nav-link text-dark">{{ request.user.username }}</a>
95+
{% endif %}
9296
</li>
9397
<li class="nav-item">
9498
<a href="{% url "settings.linked-accounts" %}" class="nav-link">Settings</a>
Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
def team(request):
22
if not (hasattr(request, "user") and request.user.is_authenticated):
33
return {}
4-
name = request.user.username
54
membership = request.user.teams.filter(team__is_active=True).first()
65
if membership:
7-
name = membership.team.name
8-
return {"team": name}
6+
return {"team": membership.team.name}
7+
return {}

0 commit comments

Comments
 (0)