External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-05-07 17:37:37 -02:30
Code Issues Packages Projects Releases Wiki Activity

cascade delete labels

Browse Source
This commit is contained in:
Chris Meyers
2016-04-11 16:02:42 -04:00
parent 0a15ece049
commit 5bf83e8b64
2 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
awx/main/access.py
View File

@@ -1204,7 +1204,7 @@ class LabelAccess(BaseAccess):
def can_read(self, obj): def can_read(self, obj):
if self.user.is_superuser: if self.user.is_superuser:
return True return True
return obj.organization and obj.organization.accessible_by(self.user, {'read': True}) return obj.organization.accessible_by(self.user, {'read': True})
def can_add(self, data): def can_add(self, data):
if self.user.is_superuser: if self.user.is_superuser:
@@ -1224,7 +1224,7 @@ class LabelAccess(BaseAccess):
if self.can_add(data) is False: if self.can_add(data) is False:
return False return False
return obj.organization and obj.organization.accessible_by(self.user, ALL_PERMISSIONS) return obj.organization.accessible_by(self.user, ALL_PERMISSIONS)
def can_delete(self, obj): def can_delete(self, obj):
return self.can_change(obj, None) return self.can_change(obj, None)

5
awx/main/models/label.py
View File

@@ -24,11 +24,8 @@ class Label(CommonModelNameNotUnique):
organization = models.ForeignKey( organization = models.ForeignKey(
'Organization', 'Organization',
related_name='labels', related_name='labels',
blank=True,
null=True,
default=None,
help_text=_('Organization this label belongs to.'), help_text=_('Organization this label belongs to.'),
on_delete=models.SET_NULL, on_delete=models.CASCADE,
) )
def get_absolute_url(self): def get_absolute_url(self):