From 1ba4da5b893d81b2b869ebaf3fe0c5e2102e3625 Mon Sep 17 00:00:00 2001 From: "holger.trampe" Date: Sun, 9 Feb 2020 21:33:12 +0100 Subject: [PATCH] =?UTF-8?q?News=20noch=20umgeschrieben=20und=20Benachricht?= =?UTF-8?q?igungen=20hinzugef=C3=BCgt,=20Bug=20bei=20Summernote=20entfernt?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 3 +- news/__pycache__/urls.cpython-38.pyc | Bin 643 -> 784 bytes news/templates/news/news_addnews.html | 4 +++ news/templates/news/news_confirm_delete.html | 4 +++ news/templates/news/news_management.html | 4 +++ news/templates/news/news_single.html | 4 +++ news/templates/news/news_update.html | 4 +++ news/urls.py | 7 +++-- users/__pycache__/signals.cpython-38.pyc | Bin 2596 -> 3199 bytes users/signals.py | 28 ++++++++++++++++++- users/templates/users/base.html | 4 +-- users/templates/users/dashboard.html | 22 +++++++++++++-- 12 files changed, 75 insertions(+), 9 deletions(-) diff --git a/.gitignore b/.gitignore index b9d71cb..e4db0b0 100644 --- a/.gitignore +++ b/.gitignore @@ -31,4 +31,5 @@ users/migrations/* !users/migrations/__init__.py users/__pycache__/* -orga/__pycache__/* \ No newline at end of file +orga/__pycache__/* + diff --git a/news/__pycache__/urls.cpython-38.pyc b/news/__pycache__/urls.cpython-38.pyc index 329ef6401b4b4f0850f2e6914ddcd3880cf5bef8..7a236e21bcc7e6aca9445f31ce7cd40f67628eac 100644 GIT binary patch delta 357 zcmYMvze~eF6u|Mk%g?4sOxjo+L=Z#}A(OMXy0{dV2$tG+)Py9bcL|OiG6xL#2XuAx z&&faF=r)%vU9-MX%=$g`qX_nFpuhw#y!pX?OWG9x!*Gq++36eOr; zlbpl^6bfiiHMP-1s{x##-Kf&0)Iz5QN>Z%`bVv36bSiakRDV?c&3;#;2cysAYX|3O zJB_;4V;94va<<=oUY?TP%h)z4R-8Up38&c4pD520ArkhF?e|^aSAud8D!VTr|0C^lKyigurD(eFFg$ybDP`&_AmNP{V#7k$5;z|(; zX3!L#c*}0GJ!915)r=*Y+_$(>vJ&&s^Yu!La*B(XfDS5R2N5hFf)zxtfe4PtMNB4a fd>|&@{BJHR diff --git a/news/templates/news/news_addnews.html b/news/templates/news/news_addnews.html index 51dce01..4e69de0 100644 --- a/news/templates/news/news_addnews.html +++ b/news/templates/news/news_addnews.html @@ -1,6 +1,7 @@ {% extends "users/base.html" %} {% load crispy_forms_tags %} {% block content %} +{% if request.user.profile.agency.module_news %}

News anlegen

@@ -20,4 +21,7 @@ $(document).ready(function() { }); }); +{% else %} +

Das Modul News wurde in ihrer Agentur deaktiviert.

+{% endif %} {% endblock content %} \ No newline at end of file diff --git a/news/templates/news/news_confirm_delete.html b/news/templates/news/news_confirm_delete.html index f51ccaa..2b3c308 100644 --- a/news/templates/news/news_confirm_delete.html +++ b/news/templates/news/news_confirm_delete.html @@ -1,6 +1,7 @@ {% extends "users/base.html" %} {% load crispy_forms_tags %} {% block content %} +{% if request.user.profile.agency.module_news %}
@@ -16,4 +17,7 @@
+ {% else %} +

Das Modul News wurde in ihrer Agentur deaktiviert.

+{% endif %} {% endblock content %} \ No newline at end of file diff --git a/news/templates/news/news_management.html b/news/templates/news/news_management.html index baa7359..ed9b4c2 100644 --- a/news/templates/news/news_management.html +++ b/news/templates/news/news_management.html @@ -1,5 +1,6 @@ {% extends "users/base.html" %} {% block content %} +{% if request.user.profile.agency.module_news %}

News

@@ -162,4 +163,7 @@ $('#news_tabs a').on('click', function (e) { }); +{% else %} +

Das Modul News wurde in ihrer Agentur deaktiviert.

+{% endif %} {% endblock content %} diff --git a/news/templates/news/news_single.html b/news/templates/news/news_single.html index 228a5d4..36f0844 100644 --- a/news/templates/news/news_single.html +++ b/news/templates/news/news_single.html @@ -1,5 +1,6 @@ {% extends "users/base.html" %} {% block content %} +{% if request.user.profile.agency.module_news %}

{{news.name}}

@@ -12,4 +13,7 @@ {{news.media}} {{news.content|safe}}
+{% else %} +

Das Modul News wurde in ihrer Agentur deaktiviert.

+{% endif %} {% endblock content %} \ No newline at end of file diff --git a/news/templates/news/news_update.html b/news/templates/news/news_update.html index da53bfc..9c0d3d1 100644 --- a/news/templates/news/news_update.html +++ b/news/templates/news/news_update.html @@ -1,6 +1,7 @@ {% extends "users/base.html" %} {% load crispy_forms_tags %} {% block content %} +{% if request.user.profile.agency.module_news %}

News bearbeiten

@@ -20,4 +21,7 @@ $(document).ready(function() { }); }); +{% else %} +

Das Modul News wurde in ihrer Agentur deaktiviert.

+{% endif %} {% endblock content %} \ No newline at end of file diff --git a/news/urls.py b/news/urls.py index 6e3ca0e..9cbd455 100644 --- a/news/urls.py +++ b/news/urls.py @@ -1,5 +1,6 @@ from django.urls import path from .views import NewsManagement, NewsAdd, NewsDeleteView +from django.contrib.auth.decorators import login_required, permission_required from . import views ''' Permissions definiert in models.py bei USERS und dann hier vor die View geschrieben! @@ -7,9 +8,9 @@ Permissions definiert in models.py bei USERS und dann hier vor die View geschrie urlpatterns = [ path('', NewsManagement.as_view(template_name="news/news_management.html"), name='news-management'), - path('newsadd/', views.NewsAdd, name='news-add'), - path('newsupdate//', views.NewsUpdate, name='news-update'), - path('news//delete', NewsDeleteView.as_view(), name='news-delete'), + path('newsadd/', permission_required('users.modulenews')(views.NewsAdd), name='news-add'), + path('newsupdate//', permission_required('users.modulenews')(views.NewsUpdate), name='news-update'), + path('news//delete', permission_required('users.modulenews')(NewsDeleteView.as_view()), name='news-delete'), #path('ajax/loadtasks/', views.load_tasks, name='ajax_loadtasks'), #path('standard//changestat', views.StandardChangePublic, name="standard-status"), path('news//single', views.NewsSingle, name="news-single"), diff --git a/users/__pycache__/signals.cpython-38.pyc b/users/__pycache__/signals.cpython-38.pyc index 0694505654f64d57b59178986eac61e902f87999..67bc5a779dbb03c419efab00e48231339004b5e3 100644 GIT binary patch delta 1284 zcmZ8gOK%)S5bo}I?ql|CZ)_a1b};b@Wuu5k9v};Z6GbE}NERTC0BhuKuXi-FV|r!@ zL9^OJIOJj^Yc3oR!V;HAhy&pm{sTueCk`C=1xT!fpsH<*m6hh3+ONLqsqXsvyVgJF zD(^W?k-+a~|MibInunDo`s?8fcc)HRaVwN?!mU6Lt8P`rc2EoJZe7KNpb<9RrizO} zE1YxZC=s@x!r-L?#>?FKf;^z^{28votBPv_rwPM9=P&RYXzRS8_(i3y@KOWFCT}V7 z89ui~y7PyBj10Xm?!}L{D5LaI_CC95HlcIb%8po%I@vF5oz}Cz*t>KsdrRA*rR*E+ zJiVAb(Kh-kAna}S#HL|!N?0_ z{qb%6CrTHyzl~ea$fh}C7_I zT85%E>*{U8$^T*w1*ri{ z5i-tzrWP;p@_|WlF~hIO<)oVG|9y%(ymFvT?9~3Yc0?%oWSJ8%QME5GK-TRa{M*2zmibn9w}Qq6P$ z#mbwD7_9^31(a^%sB&G+@l8x^BB)v3#Rvx~Z{qh)^rt?M%E5)F9PB!1w>a88?nXAS z9*w7_Ec+O}jqsGy3(D!((T9+Y(fx$kv_WmaBCD;?8r9*NF}etkiP6j~*tA9E7D)Tu zrR+~Tow_Alq8CP71hFhbMmhj){ls;{heS delta 764 zcmYjPzi-n(6!tl>u$6aig=*_QKYj0e?|paY)ArY_)Z>M+>L8~Esqy?J#P37qA`mRX3+8{oi5VKN9_ag zn-{n$wR3I>xdJoBt??!5pw^|eoNv?muI4rVC=*^`zA#BeHjpjyMjnz=;>kmO+pJ>_ z8uCQ%k&67Q-z2VFDZC_W5(>K=WnVN^xn3kKqfRQsB1ObHv2|FNzYCi?9n5+KaPb3O z1*;0y{=+ql<`ogVWrGQ%`w?f$$Os)l)8Pi9r_W6hg-O7{{Wd9nC!{Uc%_nG(n<1IW zU*_rq)L2u&APHgyx3Or}ejKtSo5IExOM>ADqTwiu!f6uD%%=h8X?LctbZ4?xx{8fn zl&BsUFxC9q-<4n|qbFP@V8Vs*%> z{As-^ZJ}t#yDaZ5zCVJBs;HfJ5(lCer<8GV=Fg?$APLjnFa_3APR?Al&gqQB6CPx& z$J2l^fZX>wHq4KGZsz+E^HMg#eTO4ZgD-f(JG`qwet*_O96RM~lb}RgL1+>e|AQv3 N{ME~(T*GD9 - - + + diff --git a/users/templates/users/dashboard.html b/users/templates/users/dashboard.html index a03cb9e..5f751fc 100644 --- a/users/templates/users/dashboard.html +++ b/users/templates/users/dashboard.html @@ -8,7 +8,7 @@
- + {% if request.user.profile.agency.module_news %}
News
@@ -32,12 +32,22 @@
+ {% endif %} + + {% if request.user.profile.agency.module_news %}
+ {% endif %} + + {% if not request.user.profile.agency.module_news %} +
+ {% else %}
+ {% endif %} +
Neueste Standards
@@ -58,9 +68,17 @@ {% endfor %}
-
+
+ {% if not request.user.profile.agency.module_news %} +
+
+ +
+
+ {% endif %} +
{% endblock content %}