External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-01-13 11:00:03 -03:30
Code Issues Packages Projects Releases Wiki Activity

More view->model cleanup

Browse Source
This commit is contained in:
Michael DeHaan 2013-03-22 15:53:08 -04:00
parent 2c02dc73a0
commit f1fda9b5de
3 changed files with 29 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/main/base_views.py
View File

@ -44,7 +44,7 @@ class BaseDetail(generics.RetrieveUpdateDestroyAPIView):
return HttpResponse(status=204)
def delete_permissions_check(self, request, obj):
raise exceptions.NotImplementedError()
return self.__class__.model.can_user_delete(request.user, obj)
def item_permissions_check(self, request, obj):

19
lib/main/models/__init__.py
View File

@ -31,12 +31,15 @@ class CommonModel(models.Model):
def __unicode__(self):
return unicode(self.name)
@classmethod
def can_user_administrate(cls, user):
raise exceptions.NotImplementedError()
@classmethod
def can_user_delete(cls, user, obj):
raise exceptions.NotImplementedError
@classmethod
def can_user_access(cls, user, obj):
raise exceptions.NotImplementedError()
@ -88,18 +91,21 @@ class Organization(CommonModel):
import lib.urls
return reverse(lib.urls.views_OrganizationsDetail, args=(self.pk,))
@classmethod
def can_user_delete(cls, user, obj):
return user in obj.admins.all()
@classmethod
def can_user_administrate(cls, user, obj):
return request.user in obj.admins.all()
return user in obj.admins.all()
@classmethod
def can_user_access(cls, user, obj):
return self.can_user_administrate(user,obj) or request.user in obj.users.all()
return cls.can_user_administrate(user,obj) or request.user in obj.users.all()
@classmethod
def can_user_delete(cls, user, obj):
return self.can_user_administrate(user, obj)
return cls.can_user_administrate(user, obj)
class Inventory(CommonModel):
'''
@ -197,8 +203,9 @@ class Project(CommonModel):
import lib.urls
return reverse(lib.urls.views_ProjectsDetail, args=(self.pk,))
def can_user_administrate(self, user):
organizations = Organization.filter(admins__in = [ user ])
@classmethod
def can_user_administrate(cls, user, obj):
organizations = Organization.filter(admins__in = [ user ], projects__in = [ obj ])
organizations = self.organizations()
for org in organizations:
if org in project.organizations():

38
lib/main/views.py
View File

@ -51,10 +51,6 @@ class OrganizationsDetail(BaseDetail):
return is_admin
return False
def delete_permissions_check(self, request, obj):
return request.user in obj.admins.all()
class OrganizationsAuditTrailList(BaseList):
model = AuditTrail
@ -174,24 +170,20 @@ class ProjectsDetail(BaseDetail):
serializer_class = ProjectSerializer
permission_classes = (CustomRbac,)
def item_permissions_check(self, request, obj):
# #def item_permissions_check(self, request, obj):
#
# # to get, must be in a team assigned to this project
# # or be an org admin of an org this project is in
#
# raise exceptions.NotImplementedError()
#
# #is_admin = request.user in obj.admins.all()
# #is_user = request.user in obj.users.all()
# #
# #if request.method == 'GET':
# # return is_admin or is_user
# #elif request.method in [ 'PUT' ]:
# # return is_admin
# #return False
# to get, must be in a team assigned to this project
# or be an org admin of an org this project is in
raise exceptions.NotImplementedError()
#is_admin = request.user in obj.admins.all()
#is_user = request.user in obj.users.all()
#
#if request.method == 'GET':
# return is_admin or is_user
#elif request.method in [ 'PUT' ]:
# return is_admin
#return False
def delete_permissions_check(self, request, obj):
# FIXME: logic TBD
raise exceptions.NotImplementedError()
#return request.user in obj.admins.all()