From eecc3f54c1d7d521ceac416c32d219ecdf7600d1 Mon Sep 17 00:00:00 2001 From: adamscmRH Date: Mon, 10 Jul 2017 10:48:43 -0400 Subject: [PATCH 1/3] Add help_ext for diff mode --- awx/main/models/jobs.py | 1 + 1 file changed, 1 insertion(+) diff --git a/awx/main/models/jobs.py b/awx/main/models/jobs.py index 8ed3771061..1addd29715 100644 --- a/awx/main/models/jobs.py +++ b/awx/main/models/jobs.py @@ -62,6 +62,7 @@ class JobOptions(BaseModel): diff_mode = models.BooleanField( default=False, + help_text=_("If enabled, textual changes made to any templated files on the host are shown in the standard output"), ) job_type = models.CharField( max_length=64, From ee9efef4d4b6b65f412de361518579fccd1e0e43 Mon Sep 17 00:00:00 2001 From: adamscmRH Date: Wed, 12 Jul 2017 12:07:03 -0400 Subject: [PATCH 2/3] Added Migrations for diff help text --- awx/main/migrations/0038_v320_release.py | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/awx/main/migrations/0038_v320_release.py b/awx/main/migrations/0038_v320_release.py index 3a4191e913..0de18d6991 100644 --- a/awx/main/migrations/0038_v320_release.py +++ b/awx/main/migrations/0038_v320_release.py @@ -351,4 +351,14 @@ class Migration(migrations.Migration): name='ask_diff_mode_on_launch', field=models.BooleanField(default=False), ), + migrations.AlterField( + model_name='job', + name='diff_mode', + field=models.BooleanField(default=False, help_text='If enabled, textual changes made to any templated files on the host are shown in the standard output'), + ), + migrations.AlterField( + model_name='jobtemplate', + name='diff_mode', + field=models.BooleanField(default=False, help_text='If enabled, textual changes made to any templated files on the host are shown in the standard output'), + ), ] From b2193921ed5c7bb152394d052d06658b685bf918 Mon Sep 17 00:00:00 2001 From: adamscmRH Date: Wed, 12 Jul 2017 14:12:08 -0400 Subject: [PATCH 3/3] consolidated migrations for diff help text --- awx/main/migrations/0038_v320_release.py | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/awx/main/migrations/0038_v320_release.py b/awx/main/migrations/0038_v320_release.py index 0de18d6991..a5daccebc2 100644 --- a/awx/main/migrations/0038_v320_release.py +++ b/awx/main/migrations/0038_v320_release.py @@ -331,16 +331,6 @@ class Migration(migrations.Migration): name='timeout', field=models.IntegerField(default=0, help_text='The amount of time (in seconds) to run before the task is canceled.', blank=True), ), - migrations.AddField( - model_name='job', - name='diff_mode', - field=models.BooleanField(default=False), - ), - migrations.AddField( - model_name='jobtemplate', - name='diff_mode', - field=models.BooleanField(default=False), - ), migrations.AddField( model_name='adhoccommand', name='diff_mode',