From af0b5b42c0d8580610f2d650a99d7077dc8e471e Mon Sep 17 00:00:00 2001 From: Akita Noek Date: Mon, 28 Mar 2016 10:37:06 -0400 Subject: [PATCH] Merged label migrations; Active flag removal on new label system --- awx/api/serializers.py | 2 +- awx/main/access.py | 2 +- .../{0008_v300_create_labels.py => 0011_v300_create_labels.py} | 3 +-- 3 files changed, 3 insertions(+), 4 deletions(-) rename awx/main/migrations/{0008_v300_create_labels.py => 0011_v300_create_labels.py} (95%) diff --git a/awx/api/serializers.py b/awx/api/serializers.py index 462db339c9..a35dae2a7a 100644 --- a/awx/api/serializers.py +++ b/awx/api/serializers.py @@ -2222,7 +2222,7 @@ class LabelSerializer(BaseSerializer): def get_related(self, obj): res = super(LabelSerializer, self).get_related(obj) - if obj.organization and obj.organization.active: + if obj.organization: res['organization'] = reverse('api:organization_detail', args=(obj.organization.pk,)) return res diff --git a/awx/main/access.py b/awx/main/access.py index 1d08ccc6eb..8f326e3ea4 100644 --- a/awx/main/access.py +++ b/awx/main/access.py @@ -1210,7 +1210,7 @@ class LabelAccess(BaseAccess): model = Label def get_queryset(self): - qs = self.model.objects.filter(active=True).distinct() + qs = self.model.objects.distinct() if self.user.is_superuser: return qs return qs diff --git a/awx/main/migrations/0008_v300_create_labels.py b/awx/main/migrations/0011_v300_create_labels.py similarity index 95% rename from awx/main/migrations/0008_v300_create_labels.py rename to awx/main/migrations/0011_v300_create_labels.py index 0f7dcc79c3..77c58b0139 100644 --- a/awx/main/migrations/0008_v300_create_labels.py +++ b/awx/main/migrations/0011_v300_create_labels.py @@ -12,7 +12,7 @@ class Migration(migrations.Migration): dependencies = [ ('taggit', '0002_auto_20150616_2121'), migrations.swappable_dependency(settings.AUTH_USER_MODEL), - ('main', '0007_v300_credential_domain_field'), + ('main', '0010_v300_credential_domain_field'), ] operations = [ @@ -23,7 +23,6 @@ class Migration(migrations.Migration): ('created', models.DateTimeField(default=None, editable=False)), ('modified', models.DateTimeField(default=None, editable=False)), ('description', models.TextField(default=b'', blank=True)), - ('active', models.BooleanField(default=True, editable=False)), ('name', models.CharField(max_length=512)), ('created_by', models.ForeignKey(related_name="{u'class': 'label', u'app_label': 'main'}(class)s_created+", on_delete=django.db.models.deletion.SET_NULL, default=None, editable=False, to=settings.AUTH_USER_MODEL, null=True)), ('modified_by', models.ForeignKey(related_name="{u'class': 'label', u'app_label': 'main'}(class)s_modified+", on_delete=django.db.models.deletion.SET_NULL, default=None, editable=False, to=settings.AUTH_USER_MODEL, null=True)),