diff --git a/orga/templates/orga/orga_main.html b/orga/templates/orga/orga_main.html index 533a3f4..b83c6e8 100644 --- a/orga/templates/orga/orga_main.html +++ b/orga/templates/orga/orga_main.html @@ -11,16 +11,15 @@ {% endblock content %} \ No newline at end of file diff --git a/tasks/migrations/__pycache__/0001_initial.cpython-38.pyc b/tasks/migrations/__pycache__/0001_initial.cpython-38.pyc index f5756a2..f537c94 100644 Binary files a/tasks/migrations/__pycache__/0001_initial.cpython-38.pyc and b/tasks/migrations/__pycache__/0001_initial.cpython-38.pyc differ diff --git a/users/__pycache__/views.cpython-38.pyc b/users/__pycache__/views.cpython-38.pyc index dcfeadb..79d49d9 100644 Binary files a/users/__pycache__/views.cpython-38.pyc and b/users/__pycache__/views.cpython-38.pyc differ diff --git a/users/templates/users/profile_update_DONTKNOW.html b/users/templates/users/profile_update_DONTKNOW.html deleted file mode 100644 index 4489168..0000000 --- a/users/templates/users/profile_update_DONTKNOW.html +++ /dev/null @@ -1,61 +0,0 @@ -{% extends "users/base.html" %} -{% load crispy_forms_tags %} -{% block content %} -
-
- -
- -
-
-
-
Name
-

- {{ user.first_name}} {{ user.last_name }} -

-
E-Mail
-

- {{ user.email }} -

-
Agenturfunktion
-

- {{ get_func_display }} -

-
-
-
Tätigkeit
-

- {{ compfunc }} -

-
Fesetznetz
-

- {{ phoneland }} -

-
Mobil
-

- {{ phonemobile }} -

-
-
-
-
- -
-
- {% csrf_token %} -
- - Profil bearbeiten - - - {{ profileform_form|crispy }} -
-
-
-   - Abbrechen -
-
-
-
-{% endblock content %} \ No newline at end of file diff --git a/users/views.py b/users/views.py index 5ca26af..2ef9fde 100644 --- a/users/views.py +++ b/users/views.py @@ -55,9 +55,7 @@ class AgencyCreateView(CreateView): html_message=msg_html, fail_silently=False ) - return super().form_valid(form) - - + return super().form_valid(form) @login_required def dashboard(request): @@ -69,7 +67,7 @@ def dashboard(request): # Loading only user same agency # Change context and return for template-data # # Get all Users of the Same Agency as logged user - standards_of_agency = Standards.objects.filter(agency__pk=request.user.profile.agency.pk).filter(public=True).order_by('-created_standard_date')[:10] + standards_of_agency = Standards.objects.filter(agency__pk=request.user.profile.agency.pk).filter(public=True).order_by('-created_standard_date')[:5] filterdate = datetime.now() news = News.objects.filter(agency__pk=request.user.profile.agency.pk).filter(go_online_on__lt=filterdate).filter(go_offline_on__gt=filterdate).order_by('-go_online_on')[:4] @@ -126,9 +124,6 @@ class UsersCreateUser(LoginRequiredMixin, CreateView): html_message=msg_html, fail_silently=False, ) - - - return super().form_valid(form) # USER muss eingeloggt sein, um diese Seite zu sehen @@ -426,10 +421,6 @@ def GlobalSearch(request): final_results_st.append(tempele) i += 1 - - - - return JsonResponse({'standards' : final_results_st}) else: return HttpResponse("Request method is not a GET")