From 750b36dd2c1390a07533aae13fc0ea1d1fbb0afd Mon Sep 17 00:00:00 2001 From: "holger.trampe" Date: Tue, 11 Feb 2020 23:10:28 +0100 Subject: [PATCH] =?UTF-8?q?News=20Bugs=20behoben,=20Struktur=20angefangen,?= =?UTF-8?q?=20Bereiche=20bis=20auf=20l=C3=B6schen=20fertig=20inkl.=20Dragn?= =?UTF-8?q?drop-Order,=20CKEditor=20gel=C3=B6scht?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- areas/__pycache__/urls.cpython-38.pyc | Bin 960 -> 521 bytes areas/__pycache__/views.cpython-38.pyc | Bin 4930 -> 2075 bytes .../templates/areas/area_confirm_delete.html | 22 -- areas/templates/areas/areas_add.html | 43 --- areas/templates/areas/areas_management.html | 101 ------- areas/templates/areas/areas_update.html | 172 ------------ areas/urls.py | 8 +- areas/views.py | 92 ------ .../__pycache__/settings.cpython-38.pyc | Bin 4784 -> 3605 bytes .../__pycache__/urls.cpython-38.pyc | Bin 2223 -> 2169 bytes digitaleagentur/settings.py | 43 +-- digitaleagentur/urls.py | 6 - news/templates/news/news_management.html | 5 +- users/__pycache__/urls.cpython-38.pyc | Bin 1642 -> 1633 bytes users/templates/users/base.html | 13 - users/templates/users/profile_update.html | 262 ------------------ .../templates/users/user_confirm_delete.html | 2 +- users/templates/users/users_adduser.html | 24 -- users/templates/users/users_management.html | 81 ------ users/urls.py | 10 +- 20 files changed, 11 insertions(+), 873 deletions(-) delete mode 100644 areas/templates/areas/area_confirm_delete.html delete mode 100644 areas/templates/areas/areas_add.html delete mode 100644 areas/templates/areas/areas_management.html delete mode 100644 areas/templates/areas/areas_update.html delete mode 100644 users/templates/users/profile_update.html delete mode 100644 users/templates/users/users_adduser.html delete mode 100644 users/templates/users/users_management.html diff --git a/areas/__pycache__/urls.cpython-38.pyc b/areas/__pycache__/urls.cpython-38.pyc index 20e157586888551b84aecafa101d9de28d52a61e..ce718fe52a145a739453c5a9d057ba5679e83cab 100644 GIT binary patch delta 161 zcmX@W-pQgJ%FD~e00cRz&T;%q3=EG!9Av--wiNbWW+0CP$m2@k1o6_DqPSDIf*CZqCvz}5O^#=h;?QKg#gdnpn>x9YNr91P q@+_t#rdte?<(Q4x_<&{?@l6hA_7~s*GIL)Nq_`gpd6xz$kbMs&Q6M*FvxZ1ow>r1 z{|M#EY5&4b__=1A5SH@n_kHhud47J2AaE_UE?(ImzO^muH#iR$uus(|e&?)Tt_rE-P_-!Zsn@LhwCsJ#x!*m!%&8;}Wj zt8P3bkKS6d>5aObHA78%gUfTZcRpwIQqEdU$cj~#r-FW}GC@f*+EBqWDYN1pyg`uM zZU(1Y+9ljfMydZ^yR2^(HO;o+N4LZ*9@^Eu; z5)oZ{?Qf%u7lIev#r$Qrf3N$%;x+yfZN(4Z485)WO5eN?go>!vDw@>5o7qm|ku}a& z#k>+sik9kdGcw4s$V-uZoa3rI7d9|198>*f&6EE`%?Vu=0+)r5LQT0PI$(NW958(_ zFzUinrs=8ngIK%^<)@|}GKJz}-J~?9m%7r%Q}wB#DXGZiPfLtJ1kCNxv%_Qo@0q+P z*ounetXNhs7BYGM@?Ao*RaRm~)vV-YB@*4#1TH(@d~KX#UXY5>6BsQyQN~9;8loxk O-F>vL_9+Tcc>4#Y<0DG| diff --git a/areas/__pycache__/views.cpython-38.pyc b/areas/__pycache__/views.cpython-38.pyc index fc512e95a0856ebe840053696c720528538c44d6..7cf85387a0fb91935e05d264a726f5d3c58c0d8f 100644 GIT binary patch delta 761 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 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 e75ddf6d6f601e973b1ad20501cb6fc8b5c48954..eab9b827467a3f144ed03d6b08e45980ca6ba4fb 100644 GIT binary patch delta 445 zcmYjNO-mbL5Z>8+cN1fxZnW_$8a2k44_l2!O|^a-KUzf;F9U5+o^>0k34YxK{R_Hy z^I-mguvfujLGbFqYj6Gs!8f6Y&hR`l^DxW|a~Hb~r?&$EpCWDPY3@g+Nm2e*ivKMn ziy4XIUv!zCG;EE1sJSdA&+QP`B7!b-qX$v+B4&Hok3J3{ZY$8yj|7rPA#IBSVc+V3I>P|H93f z;ucJEt3~_jtybkWOD|KIFw?AXdsPWr?U*gA+<`gn{HGY0mr4W++$D!~W08B1=O~uA zS1yQQnftK9aT)uuipqfre8o4c6-eeus9TDfSa)~TdvfC`e`*iO>*oBeM0sa3@J1z^1nwJCu@EWKFU=1 gy;@ikhR}rSGn_j!>O7cU?Nzin&t{4YXFa(44%6#z^Z)<= delta 1627 zcmZ`(S#ujj5Z10%Ygv{O=OCv;4(D=gOR>Y15FnB)IkM#=T8WT`M6A@~^;o+*@*asT z4sqv|prVQgQ$_v(RVs=XegeP1ue?wcZ@i@nOlz%#ys%T#)89AUJ$+Q|w@cWtp}d}ju5y(+ntslOfTl%a45FK;P^1bc7__Tn@Q;}zJ4FTs9%84l1sh!J=J zUx7pTD!ztS@fyC4*A4Q(H+mYriErTzOcS3m+EL7I$vA^K%o8z-H%S(7j^sQRaRC=e zTf$|$W$X(qOQ>PlkORGfZ{uxz2k#h4fC1md_xg8t@g7$D`unJ34eN-=aK%sqTf>Or zD)ROg)dPnq(=}|+GSNbND?;266xgI%1+E9u38c#<>fBNE;28RFoGKlmeS)ff5%0rE zd;q6#15Pt(P5vPq$TKYRSb8ks=HU>G2FzJDimk^ooWl=b;e4M`@k636;74$gf{o$F za0%Nmj-S8;Jur!%LJ~iN6rGpxbL=HJgN+> z!uPmsB=u&~kY$s*$-1xtE@kqXn_64 zJGthzV!IEz+4)o+)FwAg@nCxZ*^2I)Ub_{ugs{b=$z2^(P54foJ&`6s$p{lcEl_5> z4nsBF<#pHFG?@#76`RsGxy{JIb9jTnpyt=yy2G0u3~7FoIeic>F-zQMdEr>PHzsc@ zwr;WQ2=|ypahkf*)(uB*u0nj#w`$B`Smdq;@r-Yp%(pC$qksa%Y=uxTj^WfjomCjGGZX1Tv+H9ekUS2L1vgvYR zX%P-&=W{cK@=~cfcdL>s-KkbeML773tSlFo(lgcNbonM6ea4n@TDernma7@E*K#E| z^xW00N}-giYUOl34+qn?wQ3Nz=P>dP`*#$Xq$G!)Tax^byrU>_X;_NWlBGR8tH0#E@}J6%a-!2s)cyr~!~rn? diff --git a/digitaleagentur/__pycache__/urls.cpython-38.pyc b/digitaleagentur/__pycache__/urls.cpython-38.pyc index 6f2959df7e4ed6e63e29a552fc0343990497b26f..72879f8f8166476cccf089df07d35fba0cbcddbc 100644 GIT binary patch delta 505 zcmXw$yG{Z@6o#3Fu)wk__v?b7ctI2|sCYvWwY4!6QfT3skZhtP8>lI$HxV~JhXuWF zU}a(N16bJE`Lm9bOme>OKgrCQc?ti7w6>}STv+Y5*3GMbtm*7~T<%$X52Vj~Gz1X&bWOk{DMqk?1LKIHv^;2_DTp*gMl=k7v*4WILGTcGSnvpV6#V~zJa`N|F7gSi5XB0UG)2>?AlcZf!j!NYe>U8>!8J|35hZ%^0-*6cr?Hx+_eJd-Mol5JnuAkD=t^CfI z_o>qL%tEg!>1VA5zi3trU2h)bv(~QikoMz-%h9uQPPL|PRQ_J%#?*C<-&`4P>s1+K b9_w3qQF7=sa@L#k*tLz)%L2@66}pQ*S!IzS 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 7a562514f78c449e243437220538b722d6e03b70..3adb5a21e1def5b317fa0eccafb18a5c61bd5fcc 100644 GIT binary patch delta 46 ycmaFG^N@!(l$V!_0SGRgcZw_6$h(wDNU*dxwWwGRMCK;uC8nnqZ9dC1ml*(2&JVu; delta 55 zcmaFJ^NNQzl$V!_0SFYrZQ|x` {%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'),