External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-05-16 05:47:38 -02:30
Code Issues Packages Projects Releases Wiki Activity

fix scoping of scheduels form add/edit interval freq spinner, resolves #2165 (#2231)

Browse Source
This commit is contained in:
Leigh
2016-06-08 13:50:57 -04:00
parent 1d928feda9
commit d4c4b9b961
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
awx/ui/client/src/management-jobs/scheduler/schedulerForm.partial.html
View File

@@ -180,7 +180,7 @@
<div class="form-group <div class="form-group
RepeatFrequencyOptions-everyGroup RepeatFrequencyOptions-everyGroup
RepeatFrequencyOptions-formGroup" RepeatFrequencyOptions-formGroup"
ng-if="schedulerShowInterval"> ng-show="schedulerShowInterval">
<label class="Form-inputLabel <label class="Form-inputLabel
RepeatFrequencyOptions-everyLabel"> RepeatFrequencyOptions-everyLabel">
<span class="red-text">*</span> <span class="red-text">*</span>
@@ -191,7 +191,7 @@
sch-spinner="scheduler_form" sch-spinner="scheduler_form"
class="scheduler-spinner class="scheduler-spinner
SpinnerInput" SpinnerInput"
ng-model="$parent.schedulerInterval" ng-model="schedulerInterval"
min="1" min="1"
max="999" max="999"
ng-change="resetError('scheduler_interval_error')" ng-change="resetError('scheduler_interval_error')"
@@ -568,7 +568,7 @@
<div class="col-md-6 inputSpacer"> <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> <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> </div>
<!-- end management job fields --> <!-- end management job fields -->
</form> </form>
<div class="SchedulerFormDetail-container <div class="SchedulerFormDetail-container
@@ -583,7 +583,7 @@
<label class="SchedulerFormDetail-label"> <label class="SchedulerFormDetail-label">
Description Description
</label> </label>
<div class="SchedulerFormDetail-nlp"> <div class="SchedulerFormDetail-nlp" ng-hide="rrule_nlp_description == 'Natural language description not available' ">
{{ rrule_nlp_description }} {{ rrule_nlp_description }}
</div> </div>
<div class="SchedulerFormDetail-occurrenceHeader"> <div class="SchedulerFormDetail-occurrenceHeader">

6
awx/ui/client/src/scheduler/schedulerForm.partial.html
View File

@@ -167,7 +167,7 @@
<div class="form-group <div class="form-group
RepeatFrequencyOptions-everyGroup RepeatFrequencyOptions-everyGroup
RepeatFrequencyOptions-formGroup" RepeatFrequencyOptions-formGroup"
ng-if="schedulerShowInterval"> ng-show="schedulerShowInterval">
<label class="Form-inputLabel <label class="Form-inputLabel
RepeatFrequencyOptions-everyLabel"> RepeatFrequencyOptions-everyLabel">
<span class="red-text">*</span> <span class="red-text">*</span>
@@ -178,7 +178,7 @@
sch-spinner="scheduler_form" sch-spinner="scheduler_form"
class="scheduler-spinner class="scheduler-spinner
SpinnerInput" SpinnerInput"
ng-model="$parent.schedulerInterval" ng-model="schedulerInterval"
min="1" min="1"
max="999" max="999"
ng-change="resetError('scheduler_interval_error')" ng-change="resetError('scheduler_interval_error')"
@@ -585,7 +585,7 @@
<label class="SchedulerFormDetail-label"> <label class="SchedulerFormDetail-label">
Schedule Description Schedule Description
</label> </label>
<div class="SchedulerFormDetail-nlp"> <div class="SchedulerFormDetail-nlp" ng-hide="rrule_nlp_description == 'Natural language description not available' ">
{{ rrule_nlp_description }} {{ rrule_nlp_description }}
</div> </div>
<div class="SchedulerFormDetail-occurrenceHeader"> <div class="SchedulerFormDetail-occurrenceHeader">