From f61a58dc8a7255e6d8f66c1b2bb95dd6144c2839 Mon Sep 17 00:00:00 2001 From: "holger.trampe" Date: Fri, 13 Mar 2020 14:45:11 +0100 Subject: [PATCH] =?UTF-8?q?Zwischensicherung=200.8.2=20Newsreiter=20f?= =?UTF-8?q?=C3=BCr=20ausstehende=20hinzugef=C3=BCgt?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../__pycache__/settings.cpython-38.pyc | Bin 3704 -> 3704 bytes digitaleagentur/settings.py | 10 +++ news/__pycache__/views.cpython-38.pyc | Bin 3613 -> 3673 bytes news/templates/news/news_management.html | 58 +++++++++++++++++- news/views.py | 5 +- 5 files changed, 71 insertions(+), 2 deletions(-) diff --git a/digitaleagentur/__pycache__/settings.cpython-38.pyc b/digitaleagentur/__pycache__/settings.cpython-38.pyc index 489f138b9904ac77b2dbba1bc6603adb06e99558..642abbe0a8ed253d5c4e6a314fdc8a685609a358 100644 GIT binary patch delta 162 zcmew%^FxL&l$V!_0SLnTvg5XjZsaRwl=Y3$NbyTy&18(yOz}?%ND0hj1hTbKn1UHJ zgEr4&{KnzJnO>QjQJSlllA7tw#K2I+n~|TBo?4_=Qk0lmkXpsZ=en#mZYnc|n?pAwMC2xM!eFaDu3uQ<1)K(Dx@D6u48FC{h8n~8y;N~XB9pdi1f#9^`mv#6jzVnBsuuCbzd kg>kNfMZRLm<{Mni%(BcZj7X4;iGk@q3o8>Nh-Uf^0MRfd{{R30 diff --git a/digitaleagentur/settings.py b/digitaleagentur/settings.py index 4f0e398..6557c97 100644 --- a/digitaleagentur/settings.py +++ b/digitaleagentur/settings.py @@ -168,6 +168,7 @@ MEDIA_URL = '/media/' GRAPPELLI_CLEAN_INPUT_TYPES = False # EMAILs +''' EMAIL_BACKEND = 'django.core.mail.backends.smtp.EmailBackend' EMAIL_HOST = 'smtp.strato.de' EMAIL_PORT = 587 @@ -175,7 +176,16 @@ EMAIL_USE_TLS = True EMAIL_HOST_USER = "support@digitale-agentur.com" EMAIL_HOST_PASSWORD = "aPx9m3!7x3m@8o!t" DEFAULT_FROM_EMAIL = "support@digitale-agentur.com" +''' +# EMAILs DEV DATA +EMAIL_BACKEND = 'django.core.mail.backends.smtp.EmailBackend' +EMAIL_HOST = 'gymhum.de' +EMAIL_PORT = 587 +EMAIL_USE_TLS = True +EMAIL_HOST_USER = "holger.trampe" +EMAIL_HOST_PASSWORD = "Motte2016_!" +DEFAULT_FROM_EMAIL = "holger.trampe@gymhum.de" # FOR DATEPICKER diff --git a/news/__pycache__/views.cpython-38.pyc b/news/__pycache__/views.cpython-38.pyc index f267366fec793d7d3a6aa83cc2d7cf55c60ea7d0..0b197b2cf9c441841abdcf932672aedf7b63f8bc 100644 GIT binary patch delta 896 zcmZvb&ubGw6vy*sH@n;2Y%J9Z#%R+v27{Wk=?~OaX;E9H)uNJvB3Z+3EYYOOZ0Zl# z;-TkynX5{@d6k0Ko;`_pauF~72fcU`=Q|N1(p~1mn>Rn+`@XmPCi^X$uDY(Bkk99> zN452V59w)^HsutM>J#fHGQ}4y&-hWXr`^dEWSoPDm6k}5 zMI|b*0!z~&;p^2rmSflR{8l{-{YIEAbYj81%qRxk4&r002qy`T<_$l~$8I95v)V*z9MaitUd|qoyK+X zqi>v+M8AEHu8Ow(V)6t|Edyv+QR63J7Xei;)hJap6ijX6BI8sB$1oiSDnJUD5OpUv zg^Tzk(5rU0-|!(;TaM6@ut>+t__Fxu+@wWer6zn-lwSjKK=)IC^>1@kA(Za@`l=+~ zmY;2_@m!t^)xW|HGe+#Uk>o2oZ&SmRU%;hH0FvS>KriL4Xz|lM;|?;ii*gJNIE?-P DU*e`g delta 849 zcmZvZTWb?h5XX1U-qOv*8nLuZ$VFl`O4BB7y)+hYtx8$~BB>x^2-#RumRfe>4N??* z_hnu!wvRrRegJ*-BbXPzgD*Y=#PdHZRHO;>W6qq}ne(6dp59F-8u7TJ$={EMYfrwO zJV;y;6P7%}qSAtQ5XO+8xhp zHvMTC3vm%%>2TcqMw9dKvq+D0gXYVY*LD3IVtF1~6-sf*u8dwr;0kaRSmbRxQ_jGx zN<4~ebzU{41^xxZjvAHZabVZw%}v+M@fW*FD?GG+70w_p52*eN@WRsY!gf41GDTHh z8kv2YmeGN}(dns|{(T=ZuK{sD)megf9XJ7`fLp+A;Qt1Q-2g^`Wk3hiiK!e8Z|(ff3Vmt%8n zOw_*zVE6w_ROvR9?r;!F_i=kwk{@)pHoVRYStD>HG%+RwiQks#*AEA=JQY?@z6PiP Y)ZraHITX#=#B@9<$SF$8CZmG>0Kz|)J^%m! diff --git a/news/templates/news/news_management.html b/news/templates/news/news_management.html index 3799591..8af5bdd 100644 --- a/news/templates/news/news_management.html +++ b/news/templates/news/news_management.html @@ -16,6 +16,9 @@
  • Aktuelle
    • +
  • + Ausstehende +
  • Archiv
    • @@ -69,7 +72,60 @@ - + + + +
    +
    Ausstehende News
    +
    +
    +
    + + + + + + + + + + + + {% for news_single in news_coming %} + + + + + + + + {% endfor %} + +
    TitelErstellt vonErstellt amSichtbar von/bis 
    {{news_single.name }}{{ news_single.created_by.first_name }} {{ news_single.created_by.last_name }}{{ news_single.created_date }}{{ news_single.go_online_on|date:"d.m.Y, H:i"}} bis {{ news_single.go_offline_on|date:"d.m.Y, H:i"}} + {% if news_single.created_by == request.user or perms.users.news_management %} +
    + +
    + Bearbeiten +
    + Löschen +
    +
    + {% endif %} + +
    +
    +
    +
    + + + + + + +
    Archivierte News
    diff --git a/news/views.py b/news/views.py index 6c2627c..765e5b9 100644 --- a/news/views.py +++ b/news/views.py @@ -20,8 +20,11 @@ class NewsManagement(LoginRequiredMixin, ListView): filterdate = timezone.now() news = News.objects.filter(agency__pk=self.request.user.profile.agency.pk).filter(go_online_on__lt=filterdate).filter(go_offline_on__gt=filterdate).order_by('-created_date') news_arch = News.objects.filter(agency__pk=self.request.user.profile.agency.pk).filter(go_offline_on__lt=filterdate).order_by('-created_date') + + news_coming = News.objects.filter(agency__pk=self.request.user.profile.agency.pk).filter(go_offline_on__gt=filterdate).order_by('-created_date') + context = super().get_context_data(**kwargs) - context.update({'active_link' : 'dashboard', 'news' : news, 'news_arch' : news_arch}) + context.update({'active_link' : 'dashboard', 'news' : news, 'news_arch' : news_arch, 'news_coming' : news_coming}) return context ''' class NewsAddNews(LoginRequiredMixin, CreateView):