Skip to content
Snippets Groups Projects
Commit 92a19d99 authored by Tomáš Valenta's avatar Tomáš Valenta
Browse files

merging local changes

parent c230a766
No related branches found
No related tags found
No related merge requests found
...@@ -432,6 +432,14 @@ class Contract(models.Model): ...@@ -432,6 +432,14 @@ class Contract(models.Model):
help_text="Obsah není veřejně přístupný.", help_text="Obsah není veřejně přístupný.",
) # WARNING: Dependent on the type! ) # WARNING: Dependent on the type!
expected_cost_year = models.IntegerField(
blank=True,
null=True,
verbose_name="Očekávané výdaje (rok)",
)
class Meta: class Meta:
verbose_name = "Smlouva" verbose_name = "Smlouva"
verbose_name_plural = "Smlouvy" verbose_name_plural = "Smlouvy"
......
...@@ -15,6 +15,8 @@ def index(request): ...@@ -15,6 +15,8 @@ def index(request):
request.GET.get('page') request.GET.get('page')
) )
print(request.user)
return render( return render(
request, request,
"contracts/index.html", "contracts/index.html",
......
...@@ -87,7 +87,7 @@ ...@@ -87,7 +87,7 @@
</div> </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"> <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"> <div class="flex items-center space-x-4">
<span class="head-heavy-2xs">{{ user.get_username }}</span> <span class="head-heavy-2xs">{{ user.get_username }}</span>
<div class="avatar avatar--2xs"> <div class="avatar avatar--2xs">
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment