fix refactor update in abstract (User)
parent
51aa6f7eb6
commit
869c7540e3
|
|
@ -95,11 +95,19 @@ class ObjectAbstract(models.Model):
|
||||||
return HttpResponse(self.getAllByParentID(parentID))
|
return HttpResponse(self.getAllByParentID(parentID))
|
||||||
return HttpResponse("No Permission")
|
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
|
@classmethod
|
||||||
def putObject(self, request, objectID, privilige):
|
def putObject(self, request, objectID, privilige):
|
||||||
if checkSession(request, privilige):
|
|
||||||
object = jsonLoad(request)
|
object = jsonLoad(request)
|
||||||
return self.updateObject(self, request, object, objectID)
|
if checkSession(request, privilige) and checkUserPermission(object, request)
|
||||||
|
return self.updateObject(request, object, objectID)
|
||||||
else:
|
else:
|
||||||
return HttpResponse("No Permission")
|
return HttpResponse("No Permission")
|
||||||
|
|
||||||
|
|
@ -195,14 +203,6 @@ class Users(ObjectAbstract):
|
||||||
|
|
||||||
# Update User
|
# 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):
|
def updateObject(request, userDict, objectID):
|
||||||
putUser = User.objects.get(pk = objectID)
|
putUser = User.objects.get(pk = objectID)
|
||||||
if checkPassHash(userDict['passwordOld'], putUser.password):
|
if checkPassHash(userDict['passwordOld'], putUser.password):
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue