diff --git a/dasettings/templates/dasettings/joinagn_first.html b/dasettings/templates/dasettings/joinagn_first.html index 7ad9b45..7091677 100644 --- a/dasettings/templates/dasettings/joinagn_first.html +++ b/dasettings/templates/dasettings/joinagn_first.html @@ -130,9 +130,9 @@
Möchten Sie diesem Verbund beitreten?
-
- Abbrechen - Verbund beitreten +
+ Verbund beitreten  + Abbrechen
diff --git a/dasettings/views.py b/dasettings/views.py index 23b418a..0b3332c 100644 --- a/dasettings/views.py +++ b/dasettings/views.py @@ -404,11 +404,12 @@ def SettingsAjaxRouter(request): s.public = False s.save() - + tasks = Tasks.objects.filter(agency=request.user.profile.agency, area=todelarea).delete() todelarea.delete() success = True else: success = False + # ADD TASK elif request.method == 'GET' and request.GET['action'] == "add_task" : task = Tasks(created_area_by=request.user, area=Areas.objects.get(pk=request.GET['areaid']), agency=request.user.profile.agency, name=request.GET["newvalue"]) diff --git a/digitaleagentur/__pycache__/settings.cpython-38.pyc b/digitaleagentur/__pycache__/settings.cpython-38.pyc index 3b3d210..a3abf1a 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 e089b04..b191ce2 100644 --- a/digitaleagentur/settings.py +++ b/digitaleagentur/settings.py @@ -26,7 +26,7 @@ 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" +EMAIL_HOST_PASSWORD = "n2xd7emyKZFb6UREzvbintuUIG" DEFAULT_FROM_EMAIL = "support@dev01.digitale-agentur.com" # DEV diff --git a/standards/templates/standards/standard_area.html b/standards/templates/standards/standard_area.html index 5bd902a..748c66d 100644 --- a/standards/templates/standards/standard_area.html +++ b/standards/templates/standards/standard_area.html @@ -23,7 +23,7 @@ {% for item in standards_of_agency_area %} - {% if item.public or item.created_standard_by == user or perms.users.standard_management %} + {% if item.public or item.created_standard_by == user or perms.users.standardmanager %} {{item.name}} {{item.created_standard_by.first_name}} {{item.created_standard_by.last_name}} @@ -32,16 +32,15 @@ {{ item.last_modified_on|date:"d.m.Y, H:i"}} {{item.public|yesno:"Öffentlich,Nicht öffentlich"}} - {% if item.created_standard_by == user or perms.users.standard_management %} -
- -
Bearbeiten -
- Löschen -
-
+ {% if item.created_standard_by == user or perms.users.standardmanager %} + + + + + + + + {% endif %} diff --git a/standards/templates/standards/standard_task.html b/standards/templates/standards/standard_task.html index fab6a10..ab51eb5 100644 --- a/standards/templates/standards/standard_task.html +++ b/standards/templates/standards/standard_task.html @@ -8,7 +8,7 @@
  • {{taskname}}
    • -

    Standards aus dem Aufgabenbereich {{taskname}} des Bereichs {{areaname}}

    +

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

    @@ -24,7 +24,7 @@ {% for item in standards_of_agency_task %} - {% if item.public or item.created_standard_by == user or perms.users.standard_management %} + {% if item.public or item.created_standard_by == user or perms.users.standardmanager %} @@ -33,16 +33,15 @@ diff --git a/standards/views.py b/standards/views.py index 515b303..e4f2ffc 100644 --- a/standards/views.py +++ b/standards/views.py @@ -105,9 +105,6 @@ def checkUserDirRights(request, startdir, userid): return canview - - - @login_required def StandardAdd(request, id=False): # NEW STANDARD @@ -654,7 +651,7 @@ def CopyStandard(request, pk): @login_required def StandardArea(request, pk): - standards = Standards.objects.filter(agency__pk=request.user.profile.agency.pk).filter(area__pk=pk) + standards = Standards.objects.filter(agency__pk=request.user.profile.agency.pk).exclude(area=None).exclude(task=None).filter(area__pk=pk) area = Areas.objects.get(pk=pk, agency=request.user.profile.agency) context = { 'active_link':'standards', @@ -666,7 +663,7 @@ def StandardArea(request, pk): @login_required def StandardTask(request, pk): - standards = Standards.objects.filter(agency__pk=request.user.profile.agency.pk).filter(task__pk=pk) + standards = Standards.objects.filter(agency__pk=request.user.profile.agency.pk).exclude(area=None).exclude(task=None).filter(task__pk=pk) task = Tasks.objects.get(pk=pk, agency=request.user.profile.agency) area = Areas.objects.get(pk=task.area.pk, agency=request.user.profile.agency) context = {
    {{item.name}} {{item.created_standard_by.first_name}} {{item.created_standard_by.last_name}}{{ item.last_modified_on|date:"d.m.Y, H:i"}} {{item.public|yesno:"Öffentlich,Nicht öffentlich"}} - {% if item.created_standard_by == user or perms.users.standard_management %} -
    - -
    Bearbeiten -
    - Löschen -
    -
    + {% if item.created_standard_by == user or perms.users.standardmanager %} + + + + + + + + {% endif %}