External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-01-15 20:00:43 -03:30
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1725 from jaredevantabor/fix-1648

Browse Source 
Increases the angular-tz-extension tag in package.json
This commit is contained in:
Jared Tabor 2018-04-03 23:00:42 +00:00 committed by GitHub
commit 77d3d5f5cb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
awx/ui/client/src/scheduler/schedulerAdd.controller.js
View File

@ -293,6 +293,7 @@ export default ['$filter', '$state', '$stateParams', '$http', 'Wait',
scheduler.scope.schedulerTimeZone = _.find(data, (zone) => {
return zone.name === scheduler.scope.current_timezone.name;
});
$scope.scheduleTimeChange();
});
if($scope.schedulerUTCTime) {
// The UTC time is already set

2
awx/ui/package.json
View File

@ -106,7 +106,7 @@
"angular-moment": "^0.10.1",
"angular-sanitize": "~1.6.6",
"angular-scheduler": "git+https://git@github.com/ansible/angular-scheduler#v0.3.2",
"angular-tz-extensions": "git+https://git@github.com/ansible/angular-tz-extensions#v0.5.1",
"angular-tz-extensions": "git+https://git@github.com/ansible/angular-tz-extensions#v0.5.2",
"babel-polyfill": "^6.26.0",
"bootstrap": "^3.3.7",
"bootstrap-datepicker": "^1.7.1",