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 ac17bb8..68abcba 100644 Binary files a/standards/__pycache__/views.cpython-38.pyc and b/standards/__pycache__/views.cpython-38.pyc differ 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