diff --git a/areas/__pycache__/views.cpython-38.pyc b/areas/__pycache__/views.cpython-38.pyc index 09ba9ba..1c2239d 100644 Binary files a/areas/__pycache__/views.cpython-38.pyc and b/areas/__pycache__/views.cpython-38.pyc differ diff --git a/areas/views.py b/areas/views.py index d838559..9fbe650 100644 --- a/areas/views.py +++ b/areas/views.py @@ -9,6 +9,7 @@ from django.http import HttpResponse, JsonResponse import json from django.contrib.auth.decorators import login_required from users.priomodel import Prio +from tasks.models import Tasks @login_required def area_addareas_ajax(request): @@ -62,7 +63,7 @@ def area_addareas_ajax(request): @login_required def area_neworder(request): if request.method == 'GET': - if request.GET['action'] == 'newareaorder': + if request.GET['action'] == 'newareaorder': neworderdata = json.loads(request.GET['finalod']) for ele in neworderdata: area = Areas.objects.get(pk=ele['id']) @@ -75,24 +76,10 @@ def area_neworder(request): neworderdata = json.loads(request.GET['finalod']) for ele in neworderdata: prio = list(Prio.objects.filter(user__pk=request.GET['userid'], task__pk=ele['id']))[0] - prio.prio = ele['neworder'] - prio.save() - + task = Tasks.objects.get(pk=ele['id']) + if(task.agency == request.user.profile.agency): + prio.prio = ele['neworder'] + prio.save() return HttpResponse("UPDATED") else: - return HttpResponse("Request method is not a GET") - - -''' -@login_required -def UsersPrioUpdate(request): - tempuser = User.objects.get(pk=request.GET['userid']) - if request.method == 'GET' and tempuser.profile.agency.pk == request.user.profile.agency.pk: - prio = Prio.objects.filter(user__pk=request.GET['userid']).filter(task__pk=request.GET['taskid']) - prio = list(prio)[0] - prio.prio = request.GET['value'] - prio.save() - return HttpResponse("udated...") - else: - return HttpResponse("Request method is not a GET") -''' \ No newline at end of file + return HttpResponse("Request method is not a GET") \ No newline at end of file diff --git a/orga/templates/orga/orga_single.html b/orga/templates/orga/orga_single.html index a118247..6d76602 100644 --- a/orga/templates/orga/orga_single.html +++ b/orga/templates/orga/orga_single.html @@ -80,46 +80,39 @@