From d4c4b9b9612e311958390b9a8d3686ec20c66c04 Mon Sep 17 00:00:00 2001
From: Leigh <leigh-johnson@users.noreply.github.com>
Date: Wed, 8 Jun 2016 13:50:57 -0400
Subject: [PATCH] fix scoping of scheduels form add/edit interval freq spinner,
 resolves #2165 (#2231)

---
 .../management-jobs/scheduler/schedulerForm.partial.html  | 8 ++++----
 awx/ui/client/src/scheduler/schedulerForm.partial.html    | 6 +++---
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/awx/ui/client/src/management-jobs/scheduler/schedulerForm.partial.html b/awx/ui/client/src/management-jobs/scheduler/schedulerForm.partial.html
index 1ec9de5056..8172a350ae 100644
--- a/awx/ui/client/src/management-jobs/scheduler/schedulerForm.partial.html
+++ b/awx/ui/client/src/management-jobs/scheduler/schedulerForm.partial.html
@@ -180,7 +180,7 @@
                         <div class="form-group
                             RepeatFrequencyOptions-everyGroup
                             RepeatFrequencyOptions-formGroup"
-                            ng-if="schedulerShowInterval">
+                            ng-show="schedulerShowInterval">
                             <label class="Form-inputLabel
                                 RepeatFrequencyOptions-everyLabel">
                                 <span class="red-text">*</span>
@@ -191,7 +191,7 @@
                                 sch-spinner="scheduler_form"
                                 class="scheduler-spinner
                                     SpinnerInput"
-                                ng-model="$parent.schedulerInterval"
+                                ng-model="schedulerInterval"
                                 min="1"
                                 max="999"
                                 ng-change="resetError('scheduler_interval_error')"
@@ -568,7 +568,7 @@
                         <div class="col-md-6 inputSpacer">
                             <select id="granularity_keep_unit" name="granularity_keep_unit" ng-model="granularity_keep_unit" ng-options="type.label for type in granularity_keep_unit_choices track by type.value" ng-required="true" class="form-control input-sm"></select>
                         </div>
-                    </div> 
+                    </div>
                 <!-- end management job fields     -->
                 </form>
                 <div class="SchedulerFormDetail-container
@@ -583,7 +583,7 @@
                     <label class="SchedulerFormDetail-label">
                         Description
                     </label>
-                    <div class="SchedulerFormDetail-nlp">
+                    <div class="SchedulerFormDetail-nlp" ng-hide="rrule_nlp_description == 'Natural language description not available' ">
                         {{ rrule_nlp_description }}
                     </div>
                     <div class="SchedulerFormDetail-occurrenceHeader">
diff --git a/awx/ui/client/src/scheduler/schedulerForm.partial.html b/awx/ui/client/src/scheduler/schedulerForm.partial.html
index 35b1c4eded..d5dc06daf8 100644
--- a/awx/ui/client/src/scheduler/schedulerForm.partial.html
+++ b/awx/ui/client/src/scheduler/schedulerForm.partial.html
@@ -167,7 +167,7 @@
                 <div class="form-group
                     RepeatFrequencyOptions-everyGroup
                     RepeatFrequencyOptions-formGroup"
-                    ng-if="schedulerShowInterval">
+                    ng-show="schedulerShowInterval">
                     <label class="Form-inputLabel
                         RepeatFrequencyOptions-everyLabel">
                         <span class="red-text">*</span>
@@ -178,7 +178,7 @@
                         sch-spinner="scheduler_form"
                         class="scheduler-spinner
                             SpinnerInput"
-                        ng-model="$parent.schedulerInterval"
+                        ng-model="schedulerInterval"
                         min="1"
                         max="999"
                         ng-change="resetError('scheduler_interval_error')"
@@ -585,7 +585,7 @@
             <label class="SchedulerFormDetail-label">
                 Schedule Description
             </label>
-            <div class="SchedulerFormDetail-nlp">
+            <div class="SchedulerFormDetail-nlp" ng-hide="rrule_nlp_description == 'Natural language description not available' ">
                 {{ rrule_nlp_description }}
             </div>
             <div class="SchedulerFormDetail-occurrenceHeader">