From 869c7540e3ecfb001096613863f2fe12091c509d Mon Sep 17 00:00:00 2001 From: TBS093A Date: Fri, 28 Aug 2020 15:43:25 +0200 Subject: [PATCH] fix refactor update in abstract (User) --- generalApp/models.py | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/generalApp/models.py b/generalApp/models.py index 647d834..1dd9ad8 100755 --- a/generalApp/models.py +++ b/generalApp/models.py @@ -95,11 +95,19 @@ class ObjectAbstract(models.Model): return HttpResponse(self.getAllByParentID(parentID)) return HttpResponse("No Permission") + # @classmethod + # def putObject(self, request, objectID, privilige): + # if checkSession(request, privilige): + # object = jsonLoad(request) + # return self.updateObject(self, request, object, objectID) + # else: + # return HttpResponse("No Permission") + @classmethod def putObject(self, request, objectID, privilige): - if checkSession(request, privilige): - object = jsonLoad(request) - return self.updateObject(self, request, object, objectID) + object = jsonLoad(request) + if checkSession(request, privilige) and checkUserPermission(object, request) + return self.updateObject(request, object, objectID) else: return HttpResponse("No Permission") @@ -195,14 +203,6 @@ class Users(ObjectAbstract): # Update User - @classmethod - def putObject(self, request, objectID, privilige): - object = jsonLoad(request) - if checkSession(request, privilige) and checkUserPermission(object, request) - return self.updateObject(self, request, object, objectID) - else: - return HttpResponse("No Permission") - def updateObject(request, userDict, objectID): putUser = User.objects.get(pk = objectID) if checkPassHash(userDict['passwordOld'], putUser.password):