From 396848e97a002ab7816a6b9051a9faa1b076de42 Mon Sep 17 00:00:00 2001 From: Chris Meyers Date: Fri, 22 Apr 2016 12:32:30 -0400 Subject: [PATCH] labels on unified jobs --- .../migrations/0020_v300_labels_changes.py | 27 +++++++++++++++++++ awx/main/models/jobs.py | 5 ---- awx/main/models/unified_jobs.py | 11 ++++++++ 3 files changed, 38 insertions(+), 5 deletions(-) create mode 100644 awx/main/migrations/0020_v300_labels_changes.py diff --git a/awx/main/migrations/0020_v300_labels_changes.py b/awx/main/migrations/0020_v300_labels_changes.py new file mode 100644 index 0000000000..7e46746fad --- /dev/null +++ b/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), + ), + ] diff --git a/awx/main/models/jobs.py b/awx/main/models/jobs.py index c48007e24a..4e64886ab9 100644 --- a/awx/main/models/jobs.py +++ b/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) diff --git a/awx/main/models/unified_jobs.py b/awx/main/models/unified_jobs.py index 002d04f573..d4920a1357 100644 --- a/awx/main/models/unified_jobs.py +++ b/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()