mirror of
https://github.com/ansible/awx.git
synced 2024-10-31 15:21:13 +03:00
Merge pull request #1490 from chrismeyersfsu/fix-labels_unique
cascade delete labels
This commit is contained in:
commit
69812fc8ab
@ -1204,7 +1204,7 @@ class LabelAccess(BaseAccess):
|
||||
def can_read(self, obj):
|
||||
if self.user.is_superuser:
|
||||
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):
|
||||
if self.user.is_superuser:
|
||||
@ -1224,7 +1224,7 @@ class LabelAccess(BaseAccess):
|
||||
if self.can_add(data) is 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):
|
||||
return self.can_change(obj, None)
|
||||
|
19
awx/main/migrations/0015_v300_label_changes.py
Normal file
19
awx/main/migrations/0015_v300_label_changes.py
Normal file
@ -0,0 +1,19 @@
|
||||
# -*- coding: utf-8 -*-
|
||||
from __future__ import unicode_literals
|
||||
|
||||
from django.db import migrations, models
|
||||
|
||||
|
||||
class Migration(migrations.Migration):
|
||||
|
||||
dependencies = [
|
||||
('main', '0014_v300_invsource_cred'),
|
||||
]
|
||||
|
||||
operations = [
|
||||
migrations.AlterField(
|
||||
model_name='label',
|
||||
name='organization',
|
||||
field=models.ForeignKey(related_name='labels', to='main.Organization', help_text='Organization this label belongs to.'),
|
||||
),
|
||||
]
|
@ -24,11 +24,8 @@ class Label(CommonModelNameNotUnique):
|
||||
organization = models.ForeignKey(
|
||||
'Organization',
|
||||
related_name='labels',
|
||||
blank=True,
|
||||
null=True,
|
||||
default=None,
|
||||
help_text=_('Organization this label belongs to.'),
|
||||
on_delete=models.SET_NULL,
|
||||
on_delete=models.CASCADE,
|
||||
)
|
||||
|
||||
def get_absolute_url(self):
|
||||
|
Loading…
Reference in New Issue
Block a user