From 92a19d993bb39b20a8f9ceafd0f14d2e4a440e26 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Valenta?= <git@imaniti.org>
Date: Tue, 21 Feb 2023 06:29:33 +0100
Subject: [PATCH] merging local changes
---
contracts/models.py | 8 ++++++++
contracts/views.py | 2 ++
shared/templates/shared/includes/base.html | 2 +-
3 files changed, 11 insertions(+), 1 deletion(-)
diff --git a/contracts/models.py b/contracts/models.py
index c0b2abd..b1903a4 100644
--- a/contracts/models.py
+++ b/contracts/models.py
@@ -432,6 +432,14 @@ class Contract(models.Model):
help_text="Obsah není veřejně přístupný.",
) # WARNING: Dependent on the type!
+ expected_cost_year = models.IntegerField(
+ blank=True,
+ null=True,
+ verbose_name="Očekávané výdaje (rok)",
+ )
+
+
+
class Meta:
verbose_name = "Smlouva"
verbose_name_plural = "Smlouvy"
diff --git a/contracts/views.py b/contracts/views.py
index d55d154..a6262e7 100644
--- a/contracts/views.py
+++ b/contracts/views.py
@@ -15,6 +15,8 @@ def index(request):
request.GET.get('page')
)
+ print(request.user)
+
return render(
request,
"contracts/index.html",
diff --git a/shared/templates/shared/includes/base.html b/shared/templates/shared/includes/base.html
index f90d107..6848200 100644
--- a/shared/templates/shared/includes/base.html
+++ b/shared/templates/shared/includes/base.html
@@ -87,7 +87,7 @@
</div>
<div v-if="show || isLgScreenSize" class="navbar__actions navbar__section navbar__section--expandable container-padding--zero lg:container-padding--auto self-start flex flex-col sm:flex-row lg:flex-col sm:space-x-4 space-y-2 sm:space-y-0 lg:space-y-2 xl:flex-row xl:space-x-2 xl:space-y-0">
- {% if user %}
+ {% if user and not user.is_anonymous %}
<div class="flex items-center space-x-4">
<span class="head-heavy-2xs">{{ user.get_username }}</span>
<div class="avatar avatar--2xs">
--
GitLab