diff --git a/dasettings/templates/dasettings/agencynetwork_content.html b/dasettings/templates/dasettings/agencynetwork_content.html index 33e5122..1282c57 100644 --- a/dasettings/templates/dasettings/agencynetwork_content.html +++ b/dasettings/templates/dasettings/agencynetwork_content.html @@ -43,8 +43,8 @@ {{agn.standards.all|length}} {% if is_adminag %} - - + + {% else %} {% endif %} diff --git a/dasettings/templates/dasettings/groups_content.html b/dasettings/templates/dasettings/groups_content.html index a7528f3..4ab1de6 100644 --- a/dasettings/templates/dasettings/groups_content.html +++ b/dasettings/templates/dasettings/groups_content.html @@ -28,7 +28,7 @@ {% endif %} {% if not aggroup.savefordel %} - + {% endif %} diff --git a/dasettings/templates/dasettings/structure_content.html b/dasettings/templates/dasettings/structure_content.html index 213c2b6..22d27cb 100644 --- a/dasettings/templates/dasettings/structure_content.html +++ b/dasettings/templates/dasettings/structure_content.html @@ -177,7 +177,7 @@ noclickeffect:active { border-style: outset !important;} diff --git a/dasettings/views.py b/dasettings/views.py index 6b07b8f..ceb8597 100644 --- a/dasettings/views.py +++ b/dasettings/views.py @@ -450,14 +450,11 @@ def SettingsAjaxRouter(request): s.task = None s.public = False s.save() - todeltask.delete() success = True else: success = False - - - success = True + #success = True # UPDATE TASK VISIBLE elif request.method == 'GET' and request.GET['action'] == "update_visible_taskname" : task = Tasks.objects.get(pk=request.GET['id'], agency=request.user.profile.agency) diff --git a/digitaleagentur/__pycache__/settings.cpython-38.pyc b/digitaleagentur/__pycache__/settings.cpython-38.pyc index 0220448..c0cb3e8 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 61918af..1fc8714 100644 --- a/digitaleagentur/settings.py +++ b/digitaleagentur/settings.py @@ -14,32 +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__))) -############################################## PROD ##################################### -BASE_URL = "https://digitale-agentur.com/" +############################################## DEV ##################################### +BASE_URL = "https://dev01.digitale-agentur.com/" CRONAPIKEY = "gCddsaz6NOnE9QbXZM5LasdEk122D" MAILINFOKEY = "jka7sd8iukashdna78skduJAHDsu6dilaksdjba65a68iadbhjak" # SECURITY WARNING: don't run with debug turned on in production! -DEBUG = False +DEBUG = True -# MAIL PROD +# MAIL DEV EMAIL_HOST = 'smtp.strato.de' EMAIL_PORT = 587 EMAIL_USE_TLS = True -EMAIL_HOST_USER = "noreply@digitale-agentur.com" -EMAIL_HOST_PASSWORD = "48c3n6YggZBuPyShtqOQ" -DEFAULT_FROM_EMAIL = "noreply@digitale-agentur.com" +EMAIL_HOST_USER = "support@dev01.digitale-agentur.com" +EMAIL_HOST_PASSWORD = "n2xd7emyKZFb6UREzvbintuUIG" +DEFAULT_FROM_EMAIL = "support@dev01.digitale-agentur.com" -# PROD +# DEV DATABASES = { 'default': { 'ENGINE': 'django.db.backends.mysql', - 'NAME' : 'digitaleagentur', - 'USER' : 'digitaleagentur', - 'PASSWORD' : 'H9hzbzyBqtUCnZlIwL1qSrzh', + 'NAME' : 'digitaleagentur_dev01', + 'USER' : 'digitaleagentur_dev01', + 'PASSWORD' : 't3TvtGAOkFHYXdJlUMIu9u3U', 'PORT' : 3306 } } -############################################## PROD ##################################### +############################################## DEV ##################################### + # Nach zehn Stunden läuft der Cookie ab! diff --git a/organizer/templates/organizer/contacts_content.html b/organizer/templates/organizer/contacts_content.html index acb6bde..c865415 100644 --- a/organizer/templates/organizer/contacts_content.html +++ b/organizer/templates/organizer/contacts_content.html @@ -122,7 +122,7 @@ - + {% endfor %} @@ -282,7 +282,7 @@ function addCategory(){ success: function( data ) { new_id = data["new_id"]; - $('#allCategory > tbody:last-child').append(''); + $('#allCategory > tbody:last-child').append(''); } }); } diff --git a/standards/templates/standards/standard_task.html b/standards/templates/standards/standard_task.html index ab51eb5..380960b 100644 --- a/standards/templates/standards/standard_task.html +++ b/standards/templates/standards/standard_task.html @@ -3,9 +3,9 @@

Standards aus dem Tätigkeitsbereich {{taskname}} des Bereichs {{areaname}}

@@ -52,6 +52,17 @@
+ {% endblock content %} \ No newline at end of file