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

AC-1021 fixed issues with group edit and source not saving.

Browse Source
This commit is contained in:
Chris Houseknecht
2014-02-06 14:14:06 -05:00
parent 57030390c0
commit 4c38b05f90
1 changed files with 42 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

83
awx/ui/static/js/helpers/Groups.js
View File

@@ -18,30 +18,30 @@ angular.module('GroupsHelper', [ 'RestServices', 'Utilities', 'ListGenerator', '
.factory('GetSourceTypeOptions', [ 'Rest', 'ProcessErrors', 'GetBasePath', function(Rest, ProcessErrors, GetBasePath) { .factory('GetSourceTypeOptions', [ 'Rest', 'ProcessErrors', 'GetBasePath', function(Rest, ProcessErrors, GetBasePath) {
return function(params) { return function(params) {
// Lookup options for source and build an array of drop-down choices // Lookup options for source and build an array of drop-down choices
var scope = params.scope; var scope = params.scope,
var variable = params.variable; variable = params.variable;
if (scope[variable] == undefined) { if (scope[variable] === undefined) {
scope[variable] = []; scope[variable] = [];
Rest.setUrl(GetBasePath('inventory_sources')); Rest.setUrl(GetBasePath('inventory_sources'));
Rest.options() Rest.options()
.success( function(data, status, headers, config) { .success( function(data) {
var choices = data.actions.GET.source.choices var i, choices = data.actions.GET.source.choices;
for (var i=0; i < choices.length; i++) { for (i=0; i < choices.length; i++) {
if (choices[i][0] !== 'file') { if (choices[i][0] !== 'file') {
scope[variable].push({ scope[variable].push({
label: ( (choices[i][0] == '') ? 'Manual' : choices[i][1] ), label: ( (choices[i][0] === '') ? 'Manual' : choices[i][1] ),
value: choices[i][0] value: choices[i][0]
}); });
} }
} }
}) })
.error( function(data, status, headers, config) { .error( function(data, status) {
ProcessErrors(scope, data, status, null, ProcessErrors(scope, data, status, null,
{ hdr: 'Error!', msg: 'Failed to retrieve options for inventory_sources.source. OPTIONS status: ' + status }); { hdr: 'Error!', msg: 'Failed to retrieve options for inventory_sources.source. OPTIONS status: ' + status });
}); });
} }
} };
}]) }])
.factory('GetUpdateIntervalOptions', [ function() { .factory('GetUpdateIntervalOptions', [ function() {
@@ -54,7 +54,7 @@ angular.module('GroupsHelper', [ 'RestServices', 'Utilities', 'ListGenerator', '
{ label: '30 minutes', value: 30 }, { label: '30 minutes', value: 30 },
{ label: '45 minutes', value: 45 }, { label: '45 minutes', value: 45 },
{ label: '1 hour', value: 60 }, { label: '1 hour', value: 60 },
{ label: '2 hours', value: 120 }, { label: '2 hours', value: 120 },
{ label: '3 hours', value: 180 }, { label: '3 hours', value: 180 },
{ label: '4 hours', value: 240 }, { label: '4 hours', value: 240 },
{ label: '5 hours', value: 300 }, { label: '5 hours', value: 300 },
@@ -81,9 +81,9 @@ angular.module('GroupsHelper', [ 'RestServices', 'Utilities', 'ListGenerator', '
{ label: '72 hours', value: 4320 }, { label: '72 hours', value: 4320 },
{ label: 'weekly (every 7 days)', value: 10080 }, { label: 'weekly (every 7 days)', value: 10080 },
{ label: 'monthly (every 30 days)', value: 43200 } { label: 'monthly (every 30 days)', value: 43200 }
]; ];
} };
}]) }])
.factory('ViewUpdateStatus', [ 'Rest', 'ProcessErrors', 'GetBasePath', 'ShowUpdateStatus', 'Alert', 'Wait', 'Empty', 'Find', .factory('ViewUpdateStatus', [ 'Rest', 'ProcessErrors', 'GetBasePath', 'ShowUpdateStatus', 'Alert', 'Wait', 'Empty', 'Find',
function(Rest, ProcessErrors, GetBasePath, ShowUpdateStatus, Alert, Wait, Empty, Find) { function(Rest, ProcessErrors, GetBasePath, ShowUpdateStatus, Alert, Wait, Empty, Find) {
@@ -703,7 +703,7 @@ angular.module('GroupsHelper', [ 'RestServices', 'Utilities', 'ListGenerator', '
scope.source_vars = "---"; scope.source_vars = "---";
} }
else { else {
var json_obj = JSON.parse(data.extra_vars); var json_obj = JSON.parse(data.source_vars);
scope.source_vars = jsyaml.safeDump(json_obj); scope.source_vars = jsyaml.safeDump(json_obj);
} }
master.source_vars = scope.variables; master.source_vars = scope.variables;
@@ -863,53 +863,53 @@ angular.module('GroupsHelper', [ 'RestServices', 'Utilities', 'ListGenerator', '
if (scope.removeFormSaveSuccess) { if (scope.removeFormSaveSuccess) {
scope.removeFormSaveSuccess(); scope.removeFormSaveSuccess();
} }
scope.removeFormSaveSuccess = scope.$on('formSaveSuccess', function(e, group_id) { scope.removeFormSaveSuccess = scope.$on('formSaveSuccess', function(e) {
// Source data gets stored separately from the group. Validate and store Source // Source data gets stored separately from the group. Validate and store Source
// related fields, then call SaveComplete to wrap things up. // related fields, then call SaveComplete to wrap things up.
var parseError = false; var parseError = false,
var saveError = false; saveError = false,
regions, r, i,
var data = { group: group_id,
source: ( (source && source.value) ? source.value : '' ), data = { group: group_id,
source_path: scope['source_path'], source: ( (scope.source && scope.source.value) ? scope.source.value : '' ),
credential: scope['credential'], source_path: scope['source_path'],
overwrite: scope['overwrite'], credential: scope['credential'],
overwrite_vars: scope['overwrite_vars'], overwrite: scope['overwrite'],
update_on_launch: scope['update_on_launch'] overwrite_vars: scope['overwrite_vars'],
//update_interval: scope['update_interval'].value update_on_launch: scope['update_on_launch']
}; };
// Create a string out of selected list of regions // Create a string out of selected list of regions
var regions = $('#s2id_group_source_regions').select2("data"); regions = $('#s2id_group_source_regions').select2("data");
var r = []; r = [];
for (var i=0; i < regions.length; i++) { for (i=0; i < regions.length; i++) {
r.push(regions[i].id); r.push(regions[i].id);
} }
data['source_regions'] = r.join(); data['source_regions'] = r.join();
if (scope['source'] && scope['source'].value == 'ec2') { if (scope.source && scope.source.value == 'ec2') {
// for ec2, validate variable data // for ec2, validate variable data
try { try {
if (scope.envParseType == 'json') { if (scope.envParseType == 'json') {
var json_data = JSON.parse(scope.source_vars); //make sure JSON parses var json_data = JSON.parse(scope.source_vars); //make sure JSON parses
} }
else { else {
var json_data = jsyaml.load(scope.source_vars); //parse yaml var json_data = jsyaml.load(scope.source_vars); //parse yaml
} }
// Make sure our JSON is actually an object // Make sure our JSON is actually an object
if (typeof json_data !== 'object') { if (typeof json_data !== 'object') {
throw "failed to return an object!"; throw "failed to return an object!";
} }
// Send JSON as a string // Send JSON as a string
if ($.isEmptyObject(json_data)) { if ($.isEmptyObject(json_data)) {
data.source_vars = ""; data.source_vars = "";
} }
else { else {
data.source_vars = JSON.stringify(json_data, undefined, '\t'); data.source_vars = JSON.stringify(json_data);
} }
} }
catch(err) { catch(err) {
@@ -970,12 +970,13 @@ angular.module('GroupsHelper', [ 'RestServices', 'Utilities', 'ListGenerator', '
Rest.setUrl(defaultUrl); Rest.setUrl(defaultUrl);
Rest.put(data) Rest.put(data)
.success( function(data, status, headers, config) { .success( function(data, status, headers, config) {
var group = data.id;
if (scope.variables) { if (scope.variables) {
//update group variables //update group variables
Rest.setUrl(scope.variable_url); Rest.setUrl(scope.variable_url);
Rest.put(json_data) Rest.put(json_data)
.success( function(data, status, headers, config) { .success( function(data, status, headers, config) {
scope.$emit('formSaveSuccess', data.id); scope.$emit('formSaveSuccess');
}) })
.error( function(data, status, headers, config) { .error( function(data, status, headers, config) {
ProcessErrors(scope, data, status, form, ProcessErrors(scope, data, status, form,
@@ -983,7 +984,7 @@ angular.module('GroupsHelper', [ 'RestServices', 'Utilities', 'ListGenerator', '
}); });
} }
else { else {
scope.$emit('formSaveSuccess', data.id); scope.$emit('formSaveSuccess');
} }
}) })
.error( function(data, status, headers, config) { .error( function(data, status, headers, config) {