From 51deafaff93fb60a803a648e287862d17b54e145 Mon Sep 17 00:00:00 2001 From: "holger.trampe" Date: Fri, 24 Apr 2020 09:40:55 +0200 Subject: [PATCH] DynSteckbrief nochmal verbessert und Bug bei Agenturverbund behoben --- dasettings/views.py | 9 ++++++- .../__pycache__/settings.cpython-38.pyc | Bin 3946 -> 3946 bytes digitaleagentur/settings.py | 24 ++++++++++-------- orga/templates/orga/orga_single.html | 13 +++------- standards/views.py | 9 ++++++- 5 files changed, 32 insertions(+), 23 deletions(-) diff --git a/dasettings/views.py b/dasettings/views.py index e72b9a7..599f8b5 100644 --- a/dasettings/views.py +++ b/dasettings/views.py @@ -95,7 +95,14 @@ def DASettings(request): # LOAD AGENCYNETWORKS #agencynetworks = AgencyNetwork.objects.filter(creator_agency=request.user.profile.agency) | AgencyNetwork.objects.filter(adminagencys__in=[request.user.profile.agency.pk]) | AgencyNetwork.objects.filter(members__in=[request.user.profile.agency.pk]) | AgencyNetwork.objects.filter(sharemembers__in=[request.user.profile.agency.pk]) - agencynetworks = AgencyNetwork.objects.filter(adminagencys__in=[request.user.profile.agency.pk]) | AgencyNetwork.objects.filter(members__in=[request.user.profile.agency.pk]) | AgencyNetwork.objects.filter(sharemembers__in=[request.user.profile.agency.pk]) + #agencynetworks = AgencyNetwork.objects.filter(adminagencys__in=[request.user.profile.agency.pk]) | AgencyNetwork.objects.filter(members__in=[request.user.profile.agency.pk]) | AgencyNetwork.objects.filter(sharemembers__in=[request.user.profile.agency.pk]) + + agencynetworks_all = AgencyNetwork.objects.all() + agencynetworks = [] + + for a in agencynetworks_all: + if request.user.profile.agency in a.adminagencys.all() or request.user.profile.agency in a.members.all() or request.user.profile.agency in a.sharemembers.all(): + agencynetworks.append(a) context.update({"agencynetworks" : agencynetworks}) diff --git a/digitaleagentur/__pycache__/settings.cpython-38.pyc b/digitaleagentur/__pycache__/settings.cpython-38.pyc index 39f9bc6946edb76318c5941435fb4c89d2cc10cd..ed30bd790363baf9ad6e23245f052fcb51a57a58 100644 GIT binary patch delta 445 zcmXw!OD_X)6vg}R%!rnmmU=%*J?d>xuX>hxKT8$43rRU+I-*+bh-xA}gN($+Lapp2 z)^;{NiNx00Xt+1`mZ%;Axy@_9GBsj_JXobB ztWh(f>(rvK6YC?F*H%Tyu^hujrG>nC(x!N^nX^(mLe%j`3b198PHa<`8Q6_5^OD%tv(9KJq+k7WmN&SfFl3^ delta 445 zcmXw!$xgy>5XSkpg&@*`3yK>mDDJe1`-=ODJ1%q37{6NUO0<}GFg}B+M-Sq`7cem% zy?OCTOne5dRcA6^Cckg;CG!#b2#G0C^f;_~Q69FoZp6I~H%V}l4>|B4*J>|BNOw-1 zksm(FgP-z|M+L}70SXb&1S&+)&7*Ryl~4dO6ttoZakQfYotm49&_%`Q)*Nu62fgS+ zKL#{GXBfN_G)6%TQ3(f(_{0JuTcX3&Y!Vu-&4?tuU;6F!wZKKQ=1!@IZ7p`Gd-Dj>gkPt_b}eP Vm8x?@ffrl?=M~IXNj5*Ft8ZQbf0qCN diff --git a/digitaleagentur/settings.py b/digitaleagentur/settings.py index 6d7e5be..5cb5331 100644 --- a/digitaleagentur/settings.py +++ b/digitaleagentur/settings.py @@ -14,31 +14,33 @@ import os # Build paths inside the project like this: os.path.join(BASE_DIR, ...) BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__))) -############################################## DEV ##################################### -BASE_URL = "https://dev01.digitale-agentur.com/" + +############################################## PROD ##################################### +BASE_URL = "https://digitale-agentur.com/" CRONAPIKEY = "gCddsaz6NOnE9QbXZM5LasdEk122D" # SECURITY WARNING: don't run with debug turned on in production! DEBUG = True -# MAIL DEV +# MAIL PROD EMAIL_HOST = 'smtp.strato.de' EMAIL_PORT = 587 EMAIL_USE_TLS = True -EMAIL_HOST_USER = "support@dev01.digitale-agentur.com" -EMAIL_HOST_PASSWORD = "support@dev01.digitale-agentur.com" -DEFAULT_FROM_EMAIL = "support@dev01.digitale-agentur.com" +EMAIL_HOST_USER = "support@digitale-agentur.com" +EMAIL_HOST_PASSWORD = "aPx9m3!7x3m@8o!t" +DEFAULT_FROM_EMAIL = "support@digitale-agentur.com" -# DEV +# PROD DATABASES = { 'default': { 'ENGINE': 'django.db.backends.mysql', - 'NAME' : 'digitaleagentur_dev01', - 'USER' : 'digitaleagentur_dev01', - 'PASSWORD' : 't3TvtGAOkFHYXdJlUMIu9u3U', + 'NAME' : 'digitaleagentur', + 'USER' : 'digitaleagentur', + 'PASSWORD' : 'H9hzbzyBqtUCnZlIwL1qSrzh', 'PORT' : 3306 } } -############################################## DEV ##################################### + +############################################## PROD ##################################### # Nach zehn Stunden läuft der Cookie ab! diff --git a/orga/templates/orga/orga_single.html b/orga/templates/orga/orga_single.html index 7dc5abc..597b684 100644 --- a/orga/templates/orga/orga_single.html +++ b/orga/templates/orga/orga_single.html @@ -92,21 +92,21 @@ {% for task in tasks %} {% isUserInAuth task area request.user as checkIsUserAuth %} {% if task.area.pk == area.pk and task.visible and checkIsUserAuth %} -
+ {% endif %} {% isUserInEx task area request.user as checkIsUserEx %} {% if task.area.pk == area.pk and task.visible and checkIsUserEx %} -
+ {% endif %} {% isUserInRep task area request.user as checkIsUserRep %} {% if task.area.pk == area.pk and task.visible and checkIsUserRep %} -
+ {% endif %} @@ -204,13 +204,6 @@ $( document ).ready(function() { } - //AUTH - $(document).find(".view_0").hide(); - //EX - $(document).find(".view_1").hide(); - //REP - $(document).find(".view_2").hide(); - $(document).find(".view_0").show(); }); diff --git a/standards/views.py b/standards/views.py index 60f5aa3..59a8bf1 100644 --- a/standards/views.py +++ b/standards/views.py @@ -44,7 +44,14 @@ class StandardsManagement(LoginRequiredMixin, ListView): #agencynetworks = AgencyNetwork.objects.filter(creator_agency=self.request.user.profile.agency) | AgencyNetwork.objects.filter(adminagencys__in=[self.request.user.profile.agency.pk]) | AgencyNetwork.objects.filter(members__in=[self.request.user.profile.agency.pk]) | AgencyNetwork.objects.filter(sharemembers__in=[self.request.user.profile.agency.pk]) - agencynetworks = AgencyNetwork.objects.filter(adminagencys__in=[self.request.user.profile.agency.pk]) | AgencyNetwork.objects.filter(members__in=[self.request.user.profile.agency.pk]) | AgencyNetwork.objects.filter(sharemembers__in=[self.request.user.profile.agency.pk]) + #agencynetworks = AgencyNetwork.objects.filter(adminagencys__in=[self.request.user.profile.agency.pk]) | AgencyNetwork.objects.filter(members__in=[self.request.user.profile.agency.pk]) | AgencyNetwork.objects.filter(sharemembers__in=[self.request.user.profile.agency.pk]) + + agencynetworks_all = AgencyNetwork.objects.all() + agencynetworks = [] + + for a in agencynetworks_all: + if self.request.user.profile.agency in a.adminagencys.all() or self.request.user.profile.agency in a.members.all() or self.request.user.profile.agency in a.sharemembers.all(): + agencynetworks.append(a) allagencynetworkstandards = [] for agn in agencynetworks: