diff --git a/.gitignore b/.gitignore index 8499533..bab5860 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,6 @@ media/agencydata/* -media/agencymain/* !media/agencymain/default.jpg +!media/agencymain/ag_default.jpg !media/agencymain/linkdefault.png digitaleagentur/__pycache__/* @@ -14,14 +14,6 @@ areas/migrations/* !areas/migrations/__init__.py areas/__pycache__/* -news/migrations/* -!news/migrations/__init__.py -news/__pycache__/* - -quicklinks/migrations/* -!quicklinks/migrations/__init__.py -quicklinks/__pycache__/* - standards/migrations/* !standards/migrations/__init__.py standards/__pycache__/* @@ -43,6 +35,14 @@ notificsys/migrations/* notificsys/__pycache__/* dasettings/migrations/* + +news/migrations/* +!news/migrations/__init__.py +news/__pycache__/* + +quicklinks/migrations/* +!quicklinks/migrations/__init__.py +quicklinks/__pycache__/* !dasettings/migrations/__init__.py dasettings/__pycache__/* diff --git a/cloud/templates/cloud/cloud_main.html b/cloud/templates/cloud/cloud_main.html index 208efbf..79cc29b 100644 --- a/cloud/templates/cloud/cloud_main.html +++ b/cloud/templates/cloud/cloud_main.html @@ -325,7 +325,7 @@ a.disabled {
- + diff --git a/dasettings/templates/dasettings/structure_content.html b/dasettings/templates/dasettings/structure_content.html index 39bfa23..0b85148 100644 --- a/dasettings/templates/dasettings/structure_content.html +++ b/dasettings/templates/dasettings/structure_content.html @@ -19,6 +19,7 @@ -o-transition: all linear .2s; transition: all linear .2s; } +noclickeffect:active { border-style: outset !important;} .colorPickSelector:hover { transform: scale(1.1); } @@ -34,8 +35,8 @@
     - - + diff --git a/digitaleagentur/__pycache__/settings.cpython-38.pyc b/digitaleagentur/__pycache__/settings.cpython-38.pyc index f71f0cd..03f9e33 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 dd02cdf..943cd90 100644 --- a/digitaleagentur/settings.py +++ b/digitaleagentur/settings.py @@ -175,21 +175,14 @@ GRAPPELLI_CLEAN_INPUT_TYPES = False # EMAILs EMAIL_BACKEND = 'django.core.mail.backends.smtp.EmailBackend' -''' + EMAIL_HOST = 'smtp.strato.de' EMAIL_PORT = 587 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" -''' -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 BOOTSTRAP4 = { diff --git a/media/agencymain/Anhui_China_1920x1080.jpg b/media/agencymain/Anhui_China_1920x1080.jpg new file mode 100644 index 0000000..a979671 Binary files /dev/null and b/media/agencymain/Anhui_China_1920x1080.jpg differ diff --git a/media/agencymain/Antarctica_1920x1080.jpg b/media/agencymain/Antarctica_1920x1080.jpg new file mode 100644 index 0000000..f1ff06d Binary files /dev/null and b/media/agencymain/Antarctica_1920x1080.jpg differ diff --git a/media/agencymain/Antigua_Guatemala_1920x1080.jpg b/media/agencymain/Antigua_Guatemala_1920x1080.jpg new file mode 100644 index 0000000..3f64532 Binary files /dev/null and b/media/agencymain/Antigua_Guatemala_1920x1080.jpg differ diff --git a/media/agencymain/Antongil_Bay_Madagascar_1920x1080.jpg b/media/agencymain/Antongil_Bay_Madagascar_1920x1080.jpg new file mode 100644 index 0000000..6fa08ec Binary files /dev/null and b/media/agencymain/Antongil_Bay_Madagascar_1920x1080.jpg differ diff --git a/media/agencymain/Antwerp_Belgium_1920x1080.jpg b/media/agencymain/Antwerp_Belgium_1920x1080.jpg new file mode 100644 index 0000000..369c343 Binary files /dev/null and b/media/agencymain/Antwerp_Belgium_1920x1080.jpg differ diff --git a/media/agencymain/Aphrodites_Rock_Cyprus_1920x1080.jpg b/media/agencymain/Aphrodites_Rock_Cyprus_1920x1080.jpg new file mode 100644 index 0000000..467fa23 Binary files /dev/null and b/media/agencymain/Aphrodites_Rock_Cyprus_1920x1080.jpg differ diff --git a/media/agencymain/Arches_National_Park_Utah_1920x1080.jpg b/media/agencymain/Arches_National_Park_Utah_1920x1080.jpg new file mode 100644 index 0000000..98c62d5 Binary files /dev/null and b/media/agencymain/Arches_National_Park_Utah_1920x1080.jpg differ diff --git a/media/agencymain/Arches_National_Park_Utah_1920x1080_VcUgLSI.jpg b/media/agencymain/Arches_National_Park_Utah_1920x1080_VcUgLSI.jpg new file mode 100644 index 0000000..ebb8e19 Binary files /dev/null and b/media/agencymain/Arches_National_Park_Utah_1920x1080_VcUgLSI.jpg differ diff --git a/media/agencymain/Arches_National_Park_Utah_1920x1080_dp5GiUe.jpg b/media/agencymain/Arches_National_Park_Utah_1920x1080_dp5GiUe.jpg new file mode 100644 index 0000000..b881be6 Binary files /dev/null and b/media/agencymain/Arches_National_Park_Utah_1920x1080_dp5GiUe.jpg differ diff --git a/media/agencymain/Atitlan_Lake_Guatemala_1920x1080.jpg b/media/agencymain/Atitlan_Lake_Guatemala_1920x1080.jpg new file mode 100644 index 0000000..60d6965 Binary files /dev/null and b/media/agencymain/Atitlan_Lake_Guatemala_1920x1080.jpg differ diff --git a/organizer/__pycache__/views.cpython-38.pyc b/organizer/__pycache__/views.cpython-38.pyc index 8476342..0679359 100644 Binary files a/organizer/__pycache__/views.cpython-38.pyc and b/organizer/__pycache__/views.cpython-38.pyc differ diff --git a/organizer/templates/organizer/passwords_content.html b/organizer/templates/organizer/passwords_content.html index ed302dd..782ac79 100644 --- a/organizer/templates/organizer/passwords_content.html +++ b/organizer/templates/organizer/passwords_content.html @@ -10,7 +10,7 @@
-
+
@@ -28,6 +28,23 @@ {% for ap in agpass %} + + + {% setbool False %} + + {% for passgrous in ap.visibleby.all %} + {% if user|has_group:passgrous.group.name %} + {% setbool True %} + {% endif %} + {% endfor %} + + {% if ap.visibleby.all|length == 0 %} + {% setbool True %} + {% endif %} + + {% getbool as groupchecker %} + + {% if groupchecker %} @@ -51,6 +68,7 @@
Bearbeiten + Zugriff einschränken
Löschen
@@ -59,6 +77,10 @@ + {% else %} + + {% endif %} {% endfor %}
{{ap.name }} {{ap.link}}
+  {{ap.name}}
@@ -68,7 +90,94 @@
+ + + + diff --git a/organizer/views.py b/organizer/views.py index 4a9fd43..4832ff8 100644 --- a/organizer/views.py +++ b/organizer/views.py @@ -5,9 +5,11 @@ from .models import QuickLinks, AGContacts, AGPassword from .forms import OrganizerAddQlForm, OrganizerAddContact, OrganizerUpdateContact, AddAGPassword from django.contrib import messages from django.shortcuts import redirect -from django.http import HttpResponse, HttpResponseRedirect +from django.http import HttpResponse, HttpResponseRedirect, JsonResponse from django.contrib.auth.decorators import login_required from django.urls import reverse_lazy +from users.models import AgencyGroup + # Create your views here. class OrganizerManagement(LoginRequiredMixin, ListView): @@ -18,7 +20,7 @@ class OrganizerManagement(LoginRequiredMixin, ListView): def get_context_data(self, **kwargs): context = super().get_context_data(**kwargs) quicklinks = QuickLinks.objects.filter(agency__pk=self.request.user.profile.agency.pk).order_by('name') - context.update({'active_link' : 'organizer', 'quicklinks' : quicklinks, 'contacts' : AGContacts.objects.filter(agency__pk=self.request.user.profile.agency.pk).order_by('last_name'), 'agpass' : AGPassword.objects.filter(agency__pk=self.request.user.profile.agency.pk).order_by('name')}) + context.update({'active_link' : 'organizer', 'quicklinks' : quicklinks, 'contacts' : AGContacts.objects.filter(agency__pk=self.request.user.profile.agency.pk).order_by('last_name'), 'agpass' : AGPassword.objects.filter(agency__pk=self.request.user.profile.agency.pk).order_by('name'), 'agencygroups' : AgencyGroup.objects.filter(agency__pk=self.request.user.profile.agency.pk).order_by('agencygroupname') }) return context class OrganizerAdd(LoginRequiredMixin, CreateView): @@ -193,4 +195,27 @@ def loaddefaultql(request): tempql = QuickLinks(agency=request.user.profile.agency, name=ele[0], link=ele[1]) tempql.save() return redirect("ql-addql") + elif request.GET["action"] == "loadpassg": + data = {} + agpass = list(AGPassword.objects.filter(pk=request.GET["passid"], agency=request.user.profile.agency)) + if(len(agpass) == 1): + agpass_ele = agpass[0] + groupsid = [] + for ag in agpass_ele.visibleby.all(): + groupsid.append({"id" : ag.pk}) + data = {'success' : True, 'passgroups' : groupsid} + else: + data = {'success' : False} + return JsonResponse(data) + elif request.GET["action"] == "changepassg": + groupid = request.GET.get('groupid') + workingpass = request.GET.get('workingpass') + value = request.GET.get('value') + if(value == "true"): + AGPassword.objects.get(pk=workingpass, agency=request.user.profile.agency).visibleby.add(AgencyGroup.objects.get(pk=groupid, agency=request.user.profile.agency)) + else: + AGPassword.objects.get(pk=workingpass, agency=request.user.profile.agency).visibleby.remove(AgencyGroup.objects.get(pk=groupid, agency=request.user.profile.agency)) + + data = {'success' : False} + return JsonResponse(data) return redirect("ql-addql") \ No newline at end of file diff --git a/standards/__pycache__/urls.cpython-38.pyc b/standards/__pycache__/urls.cpython-38.pyc index a2dd1f2..edc950c 100644 Binary files a/standards/__pycache__/urls.cpython-38.pyc and b/standards/__pycache__/urls.cpython-38.pyc differ diff --git a/users/templates/users/base.html b/users/templates/users/base.html index 8c31965..50de61f 100644 --- a/users/templates/users/base.html +++ b/users/templates/users/base.html @@ -538,4 +538,4 @@ $(window).click(function() { - \ No newline at end of file + \ No newline at end of file