diff --git a/digitaleagentur/__pycache__/settings.cpython-38.pyc b/digitaleagentur/__pycache__/settings.cpython-38.pyc index 489f138..642abbe 100644 Binary files a/digitaleagentur/__pycache__/settings.cpython-38.pyc and b/digitaleagentur/__pycache__/settings.cpython-38.pyc differ 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 f267366..0b197b2 100644 Binary files a/news/__pycache__/views.cpython-38.pyc and b/news/__pycache__/views.cpython-38.pyc differ 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):