External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-03-06 11:11:07 -03:30
Code Issues Packages Projects Releases Wiki Activity

Fix Inventory Manage > Inventory Sync schedules > add/edit (#2220)

Browse Source 
* fix Inventory Manage > Inventory Sync > add/edit, resolves #2164

* fix misassignment / jslint error
This commit is contained in:
Leigh
2016-06-08 10:32:53 -04:00
parent 7506ee3509
commit d29889a4bc
2 changed files with 20 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
awx/ui/client/src/helpers/Schedules.js
View File

@@ -526,14 +526,27 @@ export default
}; };
scope.editSchedule = function(id) { scope.editSchedule = function(id) {
var base = $state.current.name.split(".")[0]; if ($state.includes('inventoryManage')){
$state.go(base + ".edit", {schedule_id: id}); $state.go('inventoryManage.schedules.edit', {schedule_id: id});
}
else{
var base = $state.current.name.split(".")[0];
$state.go(base + ".edit", {schedule_id: id});
}
}; };
scope.addSchedule = function() { scope.addSchedule = function() {
var base = $state.current.name.split(".")[0]; if ($state.includes('inventoryManage')){
ParamPass.set(scope.schedule_url); scope.schedule_url = parent_scope.current_url.split('?')[0];
$state.go(base + ".add"); scope.base = 'inventory';
ParamPass.set(scope.base, scope.schedule_url);
$state.go('inventoryManage.schedules.add');
}
else{
var base = $state.current.name.split(".")[0];
ParamPass.set(scope.schedule_url);
$state.go(base + ".add");
}
}; };
scope.refreshSchedules = function() { scope.refreshSchedules = function() {

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

@@ -19,7 +19,7 @@ export default ['$compile', '$filter', '$state', '$stateParams', 'AddSchedule',
day = $filter('schZeroPad')(dt.getDate(), 2); day = $filter('schZeroPad')(dt.getDate(), 2);
$scope.$parent.schedulerEndDt = month + '/' + day + '/' + dt.getFullYear(); $scope.$parent.schedulerEndDt = month + '/' + day + '/' + dt.getFullYear();
}; };
// initial end @ midnight values // initial end @ midnight values
$scope.schedulerEndHour = "00"; $scope.schedulerEndHour = "00";
$scope.schedulerEndMinute = "00"; $scope.schedulerEndMinute = "00";
@@ -102,7 +102,7 @@ export default ['$compile', '$filter', '$state', '$stateParams', 'AddSchedule',
field_id: 'SchedulerForm-extraVars' field_id: 'SchedulerForm-extraVars'
}); });
} }
else if ($state.current.name === 'inventoryManageSchedules.add'){ else if ($state.current.name === 'inventoryManage.schedules.add'){
$scope.extraVars = '---'; $scope.extraVars = '---';
$scope.parseType = 'yaml'; $scope.parseType = 'yaml';
ParseTypeChange({ ParseTypeChange({
@@ -112,7 +112,6 @@ export default ['$compile', '$filter', '$state', '$stateParams', 'AddSchedule',
field_id: 'SchedulerForm-extraVars' field_id: 'SchedulerForm-extraVars'
}); });
} }
AddSchedule({ AddSchedule({
scope: $scope, scope: $scope,
callback: 'SchedulesRefresh', callback: 'SchedulesRefresh',