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

Configure Tower schedule names

Browse Source 
Added the cleanup job name to the corresponding schedule for that job
This commit is contained in:
Jared Tabor
2014-11-14 11:44:10 -05:00
parent a8002d165a
commit f0d7e3be23
1 changed files with 17 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
awx/ui/static/js/helpers/ConfigureTower.js
View File

@@ -17,9 +17,9 @@ angular.module('ConfigureTowerHelper', [ 'Utilities', 'RestServices', 'Schedules
'GeneratorHelpers']) 'GeneratorHelpers'])
.factory('ConfigureTower', ['Wait', 'CreateDialog', 'ConfigureTowerJobsList', 'GenerateList', 'GetBasePath' , 'SearchInit' , 'PaginateInit', 'PlaybookRun', 'LoadSchedulesScope', .factory('ConfigureTower', ['Wait', 'CreateDialog', 'ConfigureTowerJobsList', 'GenerateList', 'GetBasePath' , 'SearchInit' , 'PaginateInit', 'PlaybookRun', 'LoadSchedulesScope',
'SchedulesList', 'SchedulesControllerInit' , 'ConfigureTowerSchedule', 'Rest' , 'ProcessErrors', 'Empty', 'Prompt', 'SchedulesList', 'SchedulesControllerInit' , 'ConfigureTowerSchedule', 'Rest' , 'ProcessErrors',
function(Wait, CreateDialog, ConfigureTowerJobsList, GenerateList, GetBasePath, SearchInit, PaginateInit, PlaybookRun, LoadSchedulesScope, function(Wait, CreateDialog, ConfigureTowerJobsList, GenerateList, GetBasePath, SearchInit, PaginateInit, PlaybookRun, LoadSchedulesScope,
SchedulesList, SchedulesControllerInit, ConfigureTowerSchedule, Rest, ProcessErrors, Empty, Prompt) { SchedulesList, SchedulesControllerInit, ConfigureTowerSchedule, Rest, ProcessErrors) {
return function(params) { return function(params) {
// Set modal dimensions based on viewport width // Set modal dimensions based on viewport width
@@ -194,7 +194,7 @@ angular.module('ConfigureTowerHelper', [ 'Utilities', 'RestServices', 'Schedules
}; };
scope.configureSchedule = function(id) { scope.configureSchedule = function(id, name) {
Rest.setUrl(scheduleUrl+id+'/schedules/'); Rest.setUrl(scheduleUrl+id+'/schedules/');
Rest.get() Rest.get()
.success(function(data) { .success(function(data) {
@@ -203,14 +203,14 @@ angular.module('ConfigureTowerHelper', [ 'Utilities', 'RestServices', 'Schedules
ConfigureTowerSchedule({ ConfigureTowerSchedule({
scope: scope, scope: scope,
mode: 'edit', mode: 'edit',
url: scheduleUrl+id+'/schedules/', url: scheduleUrl+id+'/schedules/'
// id: id
}); });
} else { } else {
ConfigureTowerSchedule({ ConfigureTowerSchedule({
scope: scope, scope: scope,
mode: 'add', mode: 'add',
url: scheduleUrl+id+'/schedules/' url: scheduleUrl+id+'/schedules/',
name: name
}); });
} }
}) })
@@ -290,14 +290,15 @@ angular.module('ConfigureTowerHelper', [ 'Utilities', 'RestServices', 'Schedules
}]) }])
.factory('ConfigureTowerSchedule', ['$compile','SchedulerInit', 'Rest', 'Wait', 'SetSchedulesInnerDialogSize', 'SchedulePost', 'ProcessErrors', 'GetBasePath', 'Empty', .factory('ConfigureTowerSchedule', ['$compile','SchedulerInit', 'Rest', 'Wait', 'SetSchedulesInnerDialogSize', 'SchedulePost', 'ProcessErrors', 'GetBasePath', 'Empty', 'Prompt',
function($compile, SchedulerInit, Rest, Wait, SetSchedulesInnerDialogSize, SchedulePost, ProcessErrors, GetBasePath, Empty) { function($compile, SchedulerInit, Rest, Wait, SetSchedulesInnerDialogSize, SchedulePost, ProcessErrors, GetBasePath, Empty, Prompt) {
return function(params) { return function(params) {
var parent_scope = params.scope, var parent_scope = params.scope,
mode = params.mode, // 'add' or 'edit' mode = params.mode, // 'add' or 'edit'
url = params.url, url = params.url,
scope = parent_scope.$new(), scope = parent_scope.$new(),
id = params.id || undefined, id = params.id || undefined,
name = params.name || undefined,
schedule = {}, schedule = {},
scheduler, scheduler,
target, target,
@@ -365,13 +366,20 @@ function($compile, SchedulerInit, Rest, Wait, SetSchedulesInnerDialogSize, Sched
container.width($('#configure-schedules-tab').width() - 18); container.width($('#configure-schedules-tab').width() - 18);
SetSchedulesInnerDialogSize(); SetSchedulesInnerDialogSize();
container.show('slide', { direction: 'right' }, 300); container.show('slide', { direction: 'right' }, 300);
// $('#configure-save-button').prop('disabled', true); // scope.schedulerPurgeDays = (!Empty(scope.days)) ? Number(scope.days) : 30;
target.show(); target.show();
if(mode==="add"){
scope.$apply(function(){
scope.schedulerPurgeDays = 30;
scope.schedulerName = name+' Schedule';
});
}
if (mode === 'edit') { if (mode === 'edit') {
scope.$apply(function() { scope.$apply(function() {
scheduler.setRRule(schedule.rrule); scheduler.setRRule(schedule.rrule);
scheduler.setName(schedule.name); scheduler.setName(schedule.name);
scope.schedulerPurgeDays = (!Empty(scope.days)) ? Number(scope.days) : 30; scope.schedulerPurgeDays = (!Empty(scope.days)) ? Number(scope.days) : 30;
scope.id = id;
}); });
} }
}; };