diff --git a/areas/__pycache__/urls.cpython-38.pyc b/areas/__pycache__/urls.cpython-38.pyc index 20e1575..ce718fe 100644 Binary files a/areas/__pycache__/urls.cpython-38.pyc and b/areas/__pycache__/urls.cpython-38.pyc differ diff --git a/areas/__pycache__/views.cpython-38.pyc b/areas/__pycache__/views.cpython-38.pyc index fc512e9..7cf8538 100644 Binary files a/areas/__pycache__/views.cpython-38.pyc and b/areas/__pycache__/views.cpython-38.pyc differ diff --git a/areas/templates/areas/area_confirm_delete.html b/areas/templates/areas/area_confirm_delete.html deleted file mode 100644 index 5a73330..0000000 --- a/areas/templates/areas/area_confirm_delete.html +++ /dev/null @@ -1,22 +0,0 @@ -{% extends "users/base.html" %} -{% load crispy_forms_tags %} -{% block content %} -
-
-
- -
- -
-
- -
- {% csrf_token %} -

Alle unter diesem Bereich erstellten Aufgaben und Standards werden gelöscht!

-
-   - Abbrechen -
-
-
-{% endblock content %} \ No newline at end of file diff --git a/areas/templates/areas/areas_add.html b/areas/templates/areas/areas_add.html deleted file mode 100644 index 8402eb9..0000000 --- a/areas/templates/areas/areas_add.html +++ /dev/null @@ -1,43 +0,0 @@ -{% extends "users/base.html" %} -{% load crispy_forms_tags %} -{% block content %} -
-

Neuen Bereich anlegen

-
-
- {% csrf_token %} - {{ form|crispy }} -
- Farbe -
-

Nachdem Erstellen eines Bereichs können Mitarbeiter zugewiesen werden.

-
-   - Abbrechen -
-
- - - - -{% endblock content %} diff --git a/areas/templates/areas/areas_management.html b/areas/templates/areas/areas_management.html deleted file mode 100644 index b187327..0000000 --- a/areas/templates/areas/areas_management.html +++ /dev/null @@ -1,101 +0,0 @@ -{% extends "users/base.html" %} -{% block content %} - -
-

Bereichsverwaltung

-
-

- Bereiche unterteilen die Agentur in verschiedene Verantwortungsbereiche. -

-
-
- Bereich anlegen -
-
-
-
- -
-
- - - - - - - - - - - - {% for item in areas_of_agency %} - - - - - - - - {% endfor %} - -
NameErstellt vonErstellt amFarbe 
{{ item.name }}{{ item.created_area_by.first_name }} {{ item.created_area_by.last_name }}{{ item.created_area_date }}
 -
- -
-
Bereichsinfo
- Bearbeiten -
- Löschen -
-
- -
-
-
- - -{% endblock content %} diff --git a/areas/templates/areas/areas_update.html b/areas/templates/areas/areas_update.html deleted file mode 100644 index 2922aeb..0000000 --- a/areas/templates/areas/areas_update.html +++ /dev/null @@ -1,172 +0,0 @@ -{% extends "users/base.html" %} -{% load static %} -{% load crispy_forms_tags %} -{% block content %} -
-

Bereich aktualisieren

-
-
- {% csrf_token %} - {{ form|crispy }} -
- Farbe -
-
Mitarbeiter hinzufügen
-
- -
- - -
- - {% for us in possible_users %} - - {% endfor %} - - -
-
-
Zugewiesene Mitarbeiter
-
- {% if added_users|length > 0 %} - - {% for us in added_users %} - {{ us.first_name }} {{ us.last_name }}   - - {% endfor %} - {% else %} -

Diesem Bereich ist noch kein Mitarbeiter zugewiesen.

- {% endif %} -
-
- -   - Abbrechen -
-
- - - - -{% endblock content %} diff --git a/areas/urls.py b/areas/urls.py index 8d50d0b..4c17845 100644 --- a/areas/urls.py +++ b/areas/urls.py @@ -1,7 +1,7 @@ from django.urls import path from django.contrib.auth import views as auth_views from django.contrib.auth.decorators import login_required, permission_required -from .views import AreasManagement, AreasAddArea, AreaDeleteView, AreaUpdateView + from . import views ''' @@ -12,11 +12,7 @@ Permissions definiert in models.py bei USERS und dann hier vor die View geschrie ''' urlpatterns = [ - path('', permission_required('users.areas_management')(AreasManagement.as_view(template_name="areas/areas_management.html")), name='areas-management'), - path('addarea/', permission_required('users.areas_management')(AreasAddArea.as_view(template_name="areas/areas_add.html")), name='areas-addarea'), - path('areas//delete', permission_required('users.areas_management')(AreaDeleteView.as_view()), name='areas-delete'), - path('area//', permission_required('users.areas_management')(AreaUpdateView.as_view()), name='areas-manage'), - path('areaajax/', views.area_addareas_ajax, name="area-ajaxview"), + path('areaajax/', views.area_addareas_ajax, name="area-ajaxview"), path('updateorder/', views.area_neworder, name="area-ajaxorder") ] diff --git a/areas/views.py b/areas/views.py index 03dfc5a..f797b70 100644 --- a/areas/views.py +++ b/areas/views.py @@ -9,98 +9,6 @@ from django.http import HttpResponse, JsonResponse import json -class AreasManagement(LoginRequiredMixin, ListView): - model = Areas - # Adding active_link - # Loading only user same agency - # Change context and return for template-data - def get_context_data(self, **kwargs): - context = super().get_context_data(**kwargs) - # # Get all Users of the Same Agency as logged user - areas_of_agency = Areas.objects.filter(agency__pk=self.request.user.profile.agency.pk).order_by('areaorder') - - context.update({'active_link' : 'areasmanagement', 'areas_of_agency':areas_of_agency}) - return context - -class AreasAddArea(LoginRequiredMixin, CreateView): - model = Areas - success_url = '/areas' - #fields = ['name', 'color', 'desc', 'usersfield'] - form_class = AreaAddAreaForm - - #def get(self,request,*args, **kwargs): - # # User ist der hier Aufgerufene, bzw. das Profil! - # return render (request, self.template_name, {'form':self.form_class(self.request.user), 'active_link': 'areasmanagement'}) - - - # Adding active_link - def get_context_data(self, **kwargs): - context = super().get_context_data(**kwargs) - context.update({'active_link' : 'areasmanagement'}) - return context - - def form_valid(self, form): - # Send message to the site - messages.success(self.request, f'Bereich angelegt!') - # SAVE OBJECTS TO SIGNALE! - form.instance.agency = self.request.user.profile.agency - form.instance.created_area_by = self.request.user - return super().form_valid(form) - - -class AreaDeleteView(LoginRequiredMixin, DeleteView): - model = Areas - success_url = '/areas' - template_name = 'areas/area_confirm_delete.html' - - def delete(self, request, *args, **kwargs): - area = Areas.objects.get(pk=kwargs['pk']) - response = super(AreaDeleteView, self).delete(request, *args, **kwargs) - name = area.name - messages.success(request, f'Bereich ' +name+ ' wurde gelöscht!') - return response - - def get_context_data(self, **kwargs): - context = super(AreaDeleteView, self).get_context_data(**kwargs) - context['active_link'] = 'areasmanagement' - return context - -# Hier andere Nutzer ändern, wenn man Usersmanagement darf! -class AreaUpdateView(LoginRequiredMixin, UpdateView): - model = Areas - template_name = 'areas/areas_update.html' - success_url = '/areas' - form_class = AreaAddAreaForm - - def form_valid(self, form): - # Send message to the site - messages.success(self.request, f'Bereich aktualisiert!') - print(form) - return super().form_valid(form) - - # Form wird geladen; Checkboxen werden vorbereitet und hier rausgerendert. - #def get(self,request,*args, **kwargs): - # # User ist der hier Aufgerufene, bzw. das Profil! - # loggeduser = request.user - # - # return render (request, self.template_name, {'form':self.form_class(loggeduser), 'active_link': 'usersmanagement'}) - - - def get_context_data(self, **kwargs): - context = super(AreaUpdateView, self).get_context_data(**kwargs) - area = Areas.objects.get(pk=context['object'].pk) - # User still in Area - context['added_users'] = area.usersfield.all() - # Get all Users from same Agency which are NOT in context_added_users - possible_users = User.objects.filter(profile__agency__pk=self.request.user.profile.agency.pk).exclude(pk__in=context['added_users']) - context['possible_users'] = possible_users - # Active-Link for Base-Design - context['active_link'] = 'areasmanagement' - # Area ID - context['objectid'] = context['object'].pk - return context - - def area_addareas_ajax(request): if request.method == 'GET': diff --git a/digitaleagentur/__pycache__/settings.cpython-38.pyc b/digitaleagentur/__pycache__/settings.cpython-38.pyc index e75ddf6..eab9b82 100644 Binary files a/digitaleagentur/__pycache__/settings.cpython-38.pyc and b/digitaleagentur/__pycache__/settings.cpython-38.pyc differ diff --git a/digitaleagentur/__pycache__/urls.cpython-38.pyc b/digitaleagentur/__pycache__/urls.cpython-38.pyc index 6f2959d..72879f8 100644 Binary files a/digitaleagentur/__pycache__/urls.cpython-38.pyc and b/digitaleagentur/__pycache__/urls.cpython-38.pyc differ diff --git a/digitaleagentur/settings.py b/digitaleagentur/settings.py index 4c38a3f..f9563f8 100644 --- a/digitaleagentur/settings.py +++ b/digitaleagentur/settings.py @@ -27,7 +27,7 @@ SECRET_KEY = '_qv2t2lmsctjxpbb4rrp=op%_20_hxzonv^mvty1o85c)l$s^q' # SECURITY WARNING: don't run with debug turned on in production! DEBUG = True -ALLOWED_HOSTS = ['digitale-agentur.com', 'www.digitale-agentur.com', 'localhost', "0.0.0.0"] +ALLOWED_HOSTS = ['digitale-agentur.com', 'www.digitale-agentur.com', 'localhost'] @@ -44,10 +44,8 @@ INSTALLED_APPS = [ 'standards.apps.StandardsConfig', 'news.apps.NewsConfig', 'crispy_forms', - 'colorful', - 'ckeditor', + 'colorful', 'django_summernote', - 'ckeditor_uploader', 'django.contrib.admin', 'mathfilters', 'django.contrib.humanize', @@ -89,43 +87,6 @@ TEMPLATES = [ WSGI_APPLICATION = 'digitaleagentur.wsgi.application' -ASGI_APPLICATION = 'digitaleagentur.routing.application' - -# CKEDITOR -CKEDITOR_JQUERY_URL = '//ajax.googleapis.com/ajax/libs/jquery/2.1.1/jquery.min.js' - -CKEDITOR_UPLOAD_PATH = "uploadsCK/" # <-- this folder you uploaded image saved in s3 under media folder -CKEDITOR_RESTRICT_BY_USER = False -CKEDITOR_REQUIRE_STAFF=False -AWS_QUERYSTRING_AUTH = True -CKEDITOR_IMAGE_BACKEND = "pillow" -#CKEDITOR_PLUGINS.addExternal('youtube', "../ckeditorplugins/youtube/youtube/plugin.js"); - -CKEDITOR_CONFIGS = { - 'default': { - 'skin': 'moono-lisa', - 'toolbar_Basic': [ - ['Source', '-', 'Bold', 'Italic'] - ], - 'toolbar_YourCustomToolbarConfig': [ - {'name': 'basicstyles', - 'items': ['Bold', 'Italic', 'Underline', 'Strike', 'Subscript', 'Superscript', '-', 'RemoveFormat']}, - {'name': 'paragraph', - 'items': ['NumberedList', 'BulletedList', '-', 'Outdent', 'Indent', '-', 'Blockquote', 'CreateDiv', '-', - 'JustifyLeft', 'JustifyCenter', 'JustifyRight', 'JustifyBlock', '-', 'BidiLtr', 'BidiRtl', - 'Language']}, - {'name': 'links', 'items': ['Link', 'Unlink']}, - {'name': 'styles', 'items': ['Styles', 'Format', 'Font', 'FontSize']}, - {'name': 'colors', 'items': ['TextColor', 'BGColor']}, - {'name': 'tools', 'items': ['Maximize', 'ShowBlocks']}, - {'name': 'insert', - 'items': ['Image', 'Table', 'HorizontalRule', 'Smiley', 'SpecialChar', 'PageBreak']}, - '/', # put this to force next toolbar on new line - ], - 'toolbar': 'YourCustomToolbarConfig', # put selected toolbar config here - }, - -} # Database # https://docs.djangoproject.com/en/2.2/ref/settings/#databases diff --git a/digitaleagentur/urls.py b/digitaleagentur/urls.py index 2122f55..d53351c 100644 --- a/digitaleagentur/urls.py +++ b/digitaleagentur/urls.py @@ -5,7 +5,6 @@ from django.conf import settings from django.conf.urls.static import static from users.views import AgencyCreateView from . import views -from ckeditor_uploader.views import upload from django.contrib.auth.decorators import login_required ''' @@ -46,8 +45,3 @@ urlpatterns = [ ] + static(settings.STATIC_URL, document_root=settings.STATIC_ROOT) if settings.DEBUG: urlpatterns += static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT) - -#urlpatterns += [ -# path('ckeditor/upload/', login_required(upload), name='ckeditor_upload'), -# path('ckeditor/', include('ckeditor_uploader.urls')), -#] \ No newline at end of file diff --git a/news/templates/news/news_management.html b/news/templates/news/news_management.html index 7a08a08..3799591 100644 --- a/news/templates/news/news_management.html +++ b/news/templates/news/news_management.html @@ -2,11 +2,8 @@ {% block content %} {% if request.user.profile.agency.module_news %}
-

News

+

News 

-

- Hier können aktuelle Nachrichten für die Agentur erstellt und verwaltet werden. -

 News diff --git a/users/__pycache__/urls.cpython-38.pyc b/users/__pycache__/urls.cpython-38.pyc index 7a56251..3adb5a2 100644 Binary files a/users/__pycache__/urls.cpython-38.pyc and b/users/__pycache__/urls.cpython-38.pyc differ diff --git a/users/templates/users/base.html b/users/templates/users/base.html index da747ae..29f15ec 100644 --- a/users/templates/users/base.html +++ b/users/templates/users/base.html @@ -159,19 +159,6 @@ {%endif%} --> - {% if perms.users.areas_management %} - {% if active_link == 'areasmanagement' %} -
  • - {% else%} -
  • - {%endif%} - - - Bereiche - -
    • - {%endif%} - {% if perms.users.tasks_management %} {% if active_link == 'tasksmanagement' %}
  • diff --git a/users/templates/users/profile_update.html b/users/templates/users/profile_update.html deleted file mode 100644 index 4865676..0000000 --- a/users/templates/users/profile_update.html +++ /dev/null @@ -1,262 +0,0 @@ -{% extends "users/base.html" %} -{% load crispy_forms_tags %} -{% load static %} -{% block content %} - - -
    -
    - -
    - -
    -
    -
    -
    Name
    -

    - {{ prof_user.first_name}} {{ prof_user.last_name }} -

    -
    E-Mail
    -

    - {{ prof_user.email }} -

    -
    Agenturfunktion
    -

    - {{ prof_user.profile.get_func_display }} -

    -
    -
    -
    Tätigkeit
    -

    - {{ prof_user.profile.compfunc }} -

    -
    Festnetz
    -

    - {{ prof_user.profile.phoneland }} -

    -
    Mobil
    -

    - {{ prof_user.profile.phonemobile }} -

    -
    -
    -
    -
    - -
    -
    - {% csrf_token %} -
    - - Profil bearbeiten - - - {{ profileform_form|crispy }} -    -
    - Übergeordneter Mitarbeiter: {{prof_user.profile.parent.first_name}} {{prof_user.profile.parent.last_name}} -
    - -
    - - -
    - - {% for us in possible_users %} - - {% endfor %} - - -
    -
    -
    -   - Abbrechen -
    -
    -
    -
    - - -
    -
    -
    -
    -

    Bereich bestimmen

    - - -
    -
    - -
    -
    -
    - - -
    - - -
    -
    -
    -
    -{% block javascript %} - -{% endblock %} - - -{% endblock content %} \ No newline at end of file diff --git a/users/templates/users/user_confirm_delete.html b/users/templates/users/user_confirm_delete.html index dcd8a6a..c6d3809 100644 --- a/users/templates/users/user_confirm_delete.html +++ b/users/templates/users/user_confirm_delete.html @@ -15,7 +15,7 @@

    Alle vom Benutzer erstellen Standards werden dem aktuellen Benutzer zugewiesen.
    (Aktuller Benutzer: {{request.user.pre_name}} {{request.user.last_name}})

      - Abbrechen + Abbrechen
    • diff --git a/users/templates/users/users_adduser.html b/users/templates/users/users_adduser.html deleted file mode 100644 index e91c08e..0000000 --- a/users/templates/users/users_adduser.html +++ /dev/null @@ -1,24 +0,0 @@ -{% extends "users/base.html" %} -{% load crispy_forms_tags %} -{% block content %} -
    -

    Neuer Benutzer

    -
    - -
    - {% csrf_token %} - {{ form|crispy }} -
    - - -
    - *: Der Benutzer erhält direkt eine E-Mail mit einem Link zur Passworterstellung, wenn der Haken bei E-Mailbenachrichtung schicken gesetzt ist. Dies kann später auch wiederholt werden. -
    -   - Abbrechen -
    - -
    -{% endblock content %} \ No newline at end of file diff --git a/users/templates/users/users_management.html b/users/templates/users/users_management.html deleted file mode 100644 index 61af915..0000000 --- a/users/templates/users/users_management.html +++ /dev/null @@ -1,81 +0,0 @@ - - - - -{% extends "users/base.html" %} -{% block content %} -
    -

    Benutzerverwaltung

    -
    -

    - Erstellen Sie weitere Mitarbeiter ihrer Agentur. Die neuen Benutzer erhalten eine E-Mail mit einem entsprechenden Link, um ihr Passwort zu generieren. -

    -
    -
    - Benutzer anlegen -
    -
    -
    -
    - -
    -
    - - - - - - - - - - - - - - - {% for item in users_of_agency %} - - - - - - - - - - - {% endfor %} - -
    NameBenutzernameE-MailAgenturfunktionTätigkeitTelefonMobil 
    {{item.first_name }} {{ item.last_name }}{{ item.username }}{{ item.email }}{{ item.profile.get_func_display }}{{ item.profile.compfunc }}{{ item.profile.phoneland }}{{ item.profile.phonemobile }} -
    - -
    -
    Benutzerdaten
    -
    - Rechte - - Zuständigkeiten - {% if item != request.user %} -
    - Löschen - {% endif %} -
    -
    -
    -
    -
    -
    - -{% endblock content %} \ No newline at end of file diff --git a/users/urls.py b/users/urls.py index 121f6ec..01a89c1 100644 --- a/users/urls.py +++ b/users/urls.py @@ -16,13 +16,13 @@ Permissions definiert in models.py bei USERS und dann hier vor die View geschrie urlpatterns = [ path('', views.dashboard, name='users-dashboard'), path('logout/', auth_views.LogoutView.as_view(template_name='users/logout.html'), name='users-logout'), - path('usersman/', permission_required('users.users_usermanagement')(UsersManagement.as_view(template_name="users/users_management.html")), name='users-management'), - path('usersman/adduser/', permission_required('users.users_usermanagement')(UsersCreateUser.as_view(template_name="users/users_adduser.html")), name='users-adduser'), + path('usersman/', permission_required('users.usermanager')(UsersManagement.as_view(template_name="users/users_management.html")), name='users-management'), + path('usersman/adduser/', permission_required('users.usermanager')(UsersCreateUser.as_view(template_name="users/users_adduser.html")), name='users-adduser'), #path('usersman/profile/', views.profile, name='users-profile'), #path('usersman//', views.ProfileUpdateView, name='users-update'), - #path('usersman//', permission_required('users.users_usermanagement')(ProfileUpdateView.as_view()), name='users-update'), - path('usersman//perms', permission_required('users.users_usermanagement')(UsersPermUpdateView.as_view()), name='users-perm-update'), - path('usersman//delete', permission_required('users.users_usermanagement')(ProfileDeleteView.as_view()), name='users-delete'), + #path('usersman//', permission_required('users.usermanager')(ProfileUpdateView.as_view()), name='users-update'), + path('usersman//perms', permission_required('users.usermanager')(UsersPermUpdateView.as_view()), name='users-perm-update'), + path('usersman//delete', permission_required('users.usermanager')(ProfileDeleteView.as_view()), name='users-delete'), #path('agencyinfo/', views.agency, name='agencyinfo'), #path('agencyinfo//', permission_required('users.agency_change')(AgencyUpdateView.as_view()), name='agency-manage'), path('usersman//prio', views.UsersPrio, name='users-prio'),