External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-01-16 04:10:44 -03:30
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1809 from jaredevantabor/scheduler

Browse Source 
Fixes to the scheduler form
This commit is contained in:
Jared Tabor 2018-05-17 10:12:51 -07:00 committed by GitHub
commit 1876b3b0f5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
awx/ui/client/src/scheduler/schedulerEdit.controller.js
View File

@ -207,7 +207,10 @@ function($filter, $state, $stateParams, Wait, $scope, moment,
"yearlyOtherMonth",
"schedulerEnd",
"schedulerOccurrenceCount",
"schedulerEndDt"
"schedulerEndDt",
"schedulerEndHour",
"schedulerEndMinute",
"schedulerEndSecond"
], function() {
$rootScope.$broadcast("loadSchedulerDetailPane");
}, true);

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

@ -572,9 +572,9 @@
</form>
<div class="SchedulerFormDetail-container
SchedulerFormDetail-container--error"
ng-show="!schedulerIsValid && scheduler_form.$dirty">
ng-show="(preview_list.isEmpty && scheduler_form.$dirty) || (!schedulerIsValid && scheduler_form.$dirty)">
<p class="SchedulerFormDetail-errorText">
The scheduler options are invalid or incomplete.
The scheduler options are invalid, incomplete, or a date is in the past.
</p>
</div>
<div class="SchedulerFormDetail-container"
@ -607,7 +607,7 @@
ng-model="dateChoice"
id="date-choice-local"
value="local" >
Local time
Local Time Zone
</label>
<label class="radio-inline
SchedulerFormDetail-radioLabel">