From 662ceb3119fcbb2a314f80d9d58bf3c887fffbea Mon Sep 17 00:00:00 2001 From: "holger.trampe" Date: Fri, 2 Oct 2020 19:56:45 +0200 Subject: [PATCH] Supportformular mit Bereich --- .../__pycache__/settings.cpython-38.pyc | Bin 4084 -> 4259 bytes digitaleagentur/settings.py | 6 ++++++ requirements.txt | 1 + standards/views.py | 8 +++++--- 4 files changed, 12 insertions(+), 3 deletions(-) diff --git a/digitaleagentur/__pycache__/settings.cpython-38.pyc b/digitaleagentur/__pycache__/settings.cpython-38.pyc index 5e4318a16ade0282670f70fa3d62569c08fa8447..1699903e48ed1d18c23de223e95760a54438beb4 100644 GIT binary patch delta 542 zcmZ{hOK%c!6vg=u(>hX!^;sVvwpJ_9X&Ib>8J|U%T3Q}`D!po&KOC42W4f6TlWvH6 zH>6t@67>^c{2;EnaN$RA;Ro<9aqCUaFFEJl#Yyh(_@~*(UL+CP?8I5vKEq(1rd7vxg*7Sajla5h|9jj5IW4a38v(&?Ojj8CfTQFmfd`@X8gJJfq6DKsS(1bDq#zTTIEkJ+{R6(_ Bml^;7 delta 354 zcmZ{exk>|J6ouywea@IN>1^t4Lf)>|Ot5rTxUJ_AL|7ku~y%NJqj diff --git a/digitaleagentur/settings.py b/digitaleagentur/settings.py index 37970f2..9517db9 100644 --- a/digitaleagentur/settings.py +++ b/digitaleagentur/settings.py @@ -37,6 +37,12 @@ X_FRAME_OPTIONS = 'SAMEORIGIN' # SECURITY WARNING: keep the secret key used in production secret! SECRET_KEY = '_qv2t2lmsctjxpbb4rrp=op%_20_hxzonv^mvty1o85c)l$s^q' +CRONAPIKEY = "gCddsaz6NOnE9QbXZM5LasdEk122D" +MAILINFOKEY = "jka7sd8iukashdna78skduJAHDsu6dilaksdjba65a68iadbhjak" +# API KEY LEXOFFICE +LEX_API = "8f9ba01f-9e84-42c7-9548-48c254f14c19" + + #ALLOWED_HOSTS = ['digitale-agentur.com', 'www.digitale-agentur.com', '127.0.0.1', '192.168.178.101','localhost', 'dev01.digitale-agentur.com', '10.0.2.2'] # FORWARD HEADERS USE_X_FORWARDED_HOST = True diff --git a/requirements.txt b/requirements.txt index 30f643d..f4630df 100644 --- a/requirements.txt +++ b/requirements.txt @@ -27,3 +27,4 @@ django-channels-presence==1.0.0 django-cryptography==1.0 channels-redis==3.0.1 filetype==1.0.7 +python-dateutil==2.8.1 \ No newline at end of file diff --git a/standards/views.py b/standards/views.py index 31ea365..32c86eb 100644 --- a/standards/views.py +++ b/standards/views.py @@ -331,7 +331,6 @@ def StandardAdd(request, id=False): # ADD TO NETWORKS networks = normalForm.cleaned_data['checked_networks'].split(",") - ''' Alle Agenturverbunde laden, in denen die Agentur drin ist. ''' @@ -341,6 +340,7 @@ def StandardAdd(request, id=False): 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) + agencynetworks_standard_in = [] # Agenturverbünde, in denen der Standard drin sein soll @@ -350,11 +350,13 @@ def StandardAdd(request, id=False): #tempnetwork.standards.add(standard) agencynetworks_standard_in.append(tempnetwork) + print(agencynetworks_standard_in) + # Wenn Standard im gewünschten Verbund, dann rein, ansonsten raus for a in agencynetworks: if a in agencynetworks_standard_in and standard not in a.standards.all(): - a.standards.add(standard) - else: + a.standards.add(standard) + elif a not in agencynetworks_standard_in: a.standards.remove(standard)