From b901a749d610e7570bd3fcd9a1d44fdcc71323b2 Mon Sep 17 00:00:00 2001 From: Holger Trampe Date: Mon, 16 Dec 2019 21:19:58 +0100 Subject: [PATCH] =?UTF-8?q?Bug=20Standard=20ver=C3=B6ffentlichen=20ja=20ne?= =?UTF-8?q?in=20kleiner=20Zahlen=20Fixed=20Navbar=20TRY?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- areas/templates/areas/areas_management.html | 2 +- news/templates/news/news_management.html | 2 +- standards/__pycache__/views.cpython-38.pyc | Bin 6345 -> 6310 bytes .../standards/standards_management.html | 12 +++--------- standards/views.py | 6 ++---- tasks/templates/tasks/tasks_management.html | 2 +- users/templates/users/base.html | 2 +- users/templates/users/searchres.html | 2 -- users/templates/users/users_management.html | 2 +- 9 files changed, 10 insertions(+), 20 deletions(-) diff --git a/areas/templates/areas/areas_management.html b/areas/templates/areas/areas_management.html index 8b4389c..2638cc8 100644 --- a/areas/templates/areas/areas_management.html +++ b/areas/templates/areas/areas_management.html @@ -16,7 +16,7 @@
- +
diff --git a/news/templates/news/news_management.html b/news/templates/news/news_management.html index a622395..af45455 100644 --- a/news/templates/news/news_management.html +++ b/news/templates/news/news_management.html @@ -17,7 +17,7 @@
-
Name
+
diff --git a/standards/__pycache__/views.cpython-38.pyc b/standards/__pycache__/views.cpython-38.pyc index ac17bb80d1eff629bb920c1f6c60ce1e1d94734d..68abcba8227a8a9d3babd759f0275518559dc824 100644 GIT binary patch delta 549 zcmY*VO(;ZB6u#%(nR)NcdvDB`83rR|K^B^96g%UmM9BhCdeK`wWidSqx>6RbJJEe$?r4?C|qO9C|J<7dx&UeoF&UfxT*Byr)i80HH6Mkl1KBqsLP7@E& zM-(mN+7DM&hW%S*CDK zOyU}uS0%1xG<=HC;N0a1qi!w#Ql}VQ$vK)2BJ%1g^^7<=i|i98en5Q%TFHE~WALGW zBL7IHBoVIxhtzh+El;oX7(d@w#dQHgP<8 z3_D0u+pvzisRO;pdl&ND;H%Mq6V>Oihi3X24uiM!6u?O^oZSVu2%c(g0Sb7U%Y6e| CWQ@@O delta 585 zcmX|;J!lj`6vyZ7+}?iN?%m#3yfYt2ia?4a99CL+i54~i3yTC~IoLz8$*o~;(i{`6 z$fXDo2@aSd7q}%DENslSB4Q_~u@NDaMH*`nTW99>Zi@H*^XC74Z-zOqeXeC6+qQ}L z`g`^7iFxZ?_J`{90U?Tf`45CEtYbXPt%~1JEO5Y4N?^v{jW00WsqVC!VS91Jaa)a`@wC}$1|+Pr zv&{a8uxPE7?+aK_ggYXXM0mjZ79E*p?7Q$NUbB|~dhtPa3ZTx;bI;+3-FDu>G5h7b qghSTOpYnRX@Duv%ci|e|#NUeR02lFm`4zy2_~XP^fEs&Isr&~pQJWtC diff --git a/standards/templates/standards/standards_management.html b/standards/templates/standards/standards_management.html index e71f2af..73502ad 100644 --- a/standards/templates/standards/standards_management.html +++ b/standards/templates/standards/standards_management.html @@ -47,15 +47,9 @@ {% endif %} {% endfor %} {% getvar as varcounter %} - {% if varcounter > 3%}
- {{task.name}} ({{varcounter}}) -
- {% else %} -
- {{task.name}} -
- {% endif %} + {{task.name}} ({{varcounter}}) + {% setvar 0 %} {% for standard in standards_of_agency %} {% getvar as varcounter %} @@ -76,7 +70,7 @@
-
Titel
+
diff --git a/standards/views.py b/standards/views.py index 2d45238..0251b61 100644 --- a/standards/views.py +++ b/standards/views.py @@ -32,10 +32,8 @@ class StandardsManagement(LoginRequiredMixin, ListView): def StandardAdd(request): if request.method == 'POST': normalForm = StandardAddStandard(request.POST, instance=request.user) - editorForm = StandardAddStandardEditor(request.POST, instance=request.user) - + editorForm = StandardAddStandardEditor(request.POST, instance=request.user) if editorForm.is_valid() and normalForm.is_valid(): - print(request.POST) normalForm.agency = request.user.profile.agency normalForm.created_standard_by = request.user normalForm.created_standard_date = datetime.now() @@ -57,7 +55,7 @@ def StandardAdd(request): new_standard.public = normalForm.cleaned_data['public'] new_standard.save() tempstandardname = normalForm.cleaned_data['name'] - if(new_standard.public and request.user.has_perm('standard-management')): + if(new_standard.public and request.user.has_perm('users.standard_management')): messages.success(request, f'Standard {tempstandardname} hinzugefügt und veröffentlicht.') else: new_standard.public = False diff --git a/tasks/templates/tasks/tasks_management.html b/tasks/templates/tasks/tasks_management.html index a1f2eb1..d1e7d46 100644 --- a/tasks/templates/tasks/tasks_management.html +++ b/tasks/templates/tasks/tasks_management.html @@ -17,7 +17,7 @@
-
Titel
+
diff --git a/users/templates/users/base.html b/users/templates/users/base.html index 4337eab..39b7f35 100644 --- a/users/templates/users/base.html +++ b/users/templates/users/base.html @@ -40,7 +40,7 @@
-
Name
+
Name