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

Pulled in angular-scheduler fixes to allow past dates and correct interval label setting.

Browse Source
This commit is contained in:
Chris Houseknecht
2014-03-31 14:23:48 -04:00
parent 8901cd31e7
commit 0f90c44c93
5 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
awx/ui/static/lib/angular-scheduler/.bower.json
View File

@@ -1,6 +1,6 @@
{ {
"name": "angular-scheduler", "name": "angular-scheduler",
"version": "0.0.4", "version": "0.0.5",
"authors": [ "authors": [
"Chris Houseknecht <chouse@ansible.com>" "Chris Houseknecht <chouse@ansible.com>"
], ],
@@ -36,13 +36,13 @@
"rrule", "rrule",
"calendar" "calendar"
], ],
"_release": "0.0.4", "_release": "0.0.5",
"_resolution": { "_resolution": {
"type": "version", "type": "version",
"tag": "v0.0.4", "tag": "v0.0.5",
"commit": "ecde5da79b5bd3b468cd14fc2784e17a8f7e6eee" "commit": "dfbfa58ea5580cf44f95e8e2c88c91ca37acfd31"
}, },
"_source": "git://github.com/chouseknecht/angular-scheduler.git", "_source": "git://github.com/chouseknecht/angular-scheduler.git",
"_target": "~0.0.4", "_target": "~0.0.5",
"_originalSource": "angular-scheduler" "_originalSource": "angular-scheduler"
} }

2
awx/ui/static/lib/angular-scheduler/bower.json
View File

@@ -1,6 +1,6 @@
{ {
"name": "angular-scheduler", "name": "angular-scheduler",
"version": "0.0.4", "version": "0.0.5",
"authors": [ "authors": [
"Chris Houseknecht <chouse@ansible.com>" "Chris Houseknecht <chouse@ansible.com>"
], ],

2
awx/ui/static/lib/angular-scheduler/lib/angular-scheduler.html
View File

@@ -28,7 +28,7 @@
<label>Start Date <span class="fmt-help"> yyyy-mm-dd</span></label> <label>Start Date <span class="fmt-help"> yyyy-mm-dd</span></label>
<div class="input-group"> <div class="input-group">
<input type="text" class="form-control input-sm" name="schedulerStartDt" id="schedulerStartDt" ng-model="schedulerStartDt" <input type="text" class="form-control input-sm" name="schedulerStartDt" id="schedulerStartDt" ng-model="schedulerStartDt"
sch-date-picker data-min-today="true" placeholder="YYYY-MM-DD" required ng-change="scheduleTimeChange()" > sch-date-picker placeholder="YYYY-MM-DD" required ng-change="scheduleTimeChange()" >
<span class="input-group-btn"> <span class="input-group-btn">
<button class="btn btn-default btn-sm" type="button" ng-click="showCalendar('schedulerStartDt')"> <button class="btn btn-default btn-sm" type="button" ng-click="showCalendar('schedulerStartDt')">
<i class="fa fa-calendar"></i></button> <i class="fa fa-calendar"></i></button>

1
awx/ui/static/lib/angular-scheduler/lib/angular-scheduler.js vendored
View File

@@ -582,6 +582,7 @@ angular.module('AngularScheduler', ['underscore'])
if (key === 'FREQ') { if (key === 'FREQ') {
l = value.toLowerCase(); l = value.toLowerCase();
scope.schedulerFrequency = _.find(scope.frequencyOptions, function(opt) { scope.schedulerFrequency = _.find(scope.frequencyOptions, function(opt) {
scope.schedulerIntervalLabel = opt.intervalLabel;
return opt.value === l; return opt.value === l;
}); });
if (!scope.schedulerFrequency || !scope.schedulerFrequency.name) { if (!scope.schedulerFrequency || !scope.schedulerFrequency.name) {

2
bower.json
View File

@@ -15,7 +15,7 @@
"angular-md5": "~0.1.7", "angular-md5": "~0.1.7",
"angular-resource": "~1.2.12", "angular-resource": "~1.2.12",
"angular-sanitize": "~1.2.12", "angular-sanitize": "~1.2.12",
"angular-scheduler": "~0.0.4", "angular-scheduler": "~0.0.5",
"bootstrap": "~3.1.1", "bootstrap": "~3.1.1",
"components-font-awesome": "~4.0.3", "components-font-awesome": "~4.0.3",
"less.js": "~1.6.3", "less.js": "~1.6.3",