Merge pull request #1659 from chrismeyersfsu/fix-labels_unified

labels on unified jobs

awx/main/migrations/0020_v300_labels_changes.py

@@ -0,0 +1,27 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('main', '0019_v300_new_azure_credential'),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name='job',
+            name='labels',
+        ),
+        migrations.RemoveField(
+            model_name='jobtemplate',
+            name='labels',
+        ),
+        migrations.AddField(
+            model_name='unifiedjob',
+            name='labels',
+            field=models.ManyToManyField(related_name='unifiedjob_labels', to='main.Label', blank=True),
+        ),
+    ]

awx/main/models/jobs.py

@@ -135,11 +135,6 @@ class JobOptions(BaseModel):
     become_enabled = models.BooleanField(
         default=False,
     )
-    labels = models.ManyToManyField(
-        "Label",
-        blank=True,
-        related_name='%(class)s_labels'
-    )
 
     extra_vars_dict = VarsDictProperty('extra_vars', True)
 

awx/main/models/unified_jobs.py

@@ -141,6 +141,11 @@ class UnifiedJobTemplate(PolymorphicModel, CommonModelNameNotUnique, Notificatio
         default='ok',
         editable=False,
     )
+    labels = models.ManyToManyField(
+        "Label",
+        blank=True,
+        related_name='%(class)s_labels'
+    )
 
     def get_absolute_url(self):
         real_instance = self.get_real_instance()
@@ -476,6 +481,12 @@ class UnifiedJob(PolymorphicModel, PasswordFieldsModel, CommonModelNameNotUnique
         default='',
         editable=False,
     )
+    labels = models.ManyToManyField(
+        "Label",
+        blank=True,
+        related_name='%(class)s_labels'
+    )
+
 
     def get_absolute_url(self):
         real_instance = self.get_real_instance()