asc/benchcoach-django
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'v2' into v2-gamecard

Browse Source 
# Conflicts:
#	teamsnap/urls.py
#	teamsnap/views.py
This commit is contained in:
Anthony Correa
2022-06-09 07:41:10 -05:00
parent ff341b3e72 58f21c70f6
commit aa897f6f49
11 changed files with 152 additions and 167 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
benchcoach/contrib/sites/migrations/0003_set_site_domain_and_name.py
View File

@@ -23,7 +23,7 @@ def _update_or_create_site_with_sequence(site_model, connection, domain, name):
# site is created.
# To avoid this, we need to manually update DB sequence and make sure it's
# greater than the maximum value.
max_id = site_model.objects.order_by('-id').first().id
max_id = site_model.objects.order_by("-id").first().id
with connection.cursor() as cursor:
cursor.execute("SELECT last_value from django_site_id_seq")
(current_id,) = cursor.fetchone()

7
benchcoach/templates/base.html
View File

@@ -36,7 +36,7 @@
</head>
<body>
<body class="bg-light">
<div class="mb-1">
<nav class="navbar navbar-expand-md navbar-dark bg-navbar">
@@ -65,6 +65,9 @@
<li class="nav-item">
<a class="nav-link" href="{% url 'teamsnap_schedule' %}">{% translate "Schedule" %}</a>
</li>
<li class="nav-item">
<a class="nav-link" href="{% url 'teamsnap_choose_multiple_lineups' team_id=request.user.preferences.managed_team_id%}?num=3">{% translate "Multi-Lineup" %}</a>
</li>
<li class="nav-item dropdown">
<a class="nav-link dropdown-toggle" href="#" id="navbarDropdown" role="button" data-bs-toggle="dropdown" aria-expanded="false">
@@ -107,7 +110,7 @@
</div>
<div class="container bg-light">
<div class="container">
{% if messages %}
{% for message in messages %}