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

Fixed merge conflicts

Browse Source
This commit is contained in:
Ken Hoes
2016-11-30 09:39:27 -05:00
parent 9cb39cb0d9
commit 200bbf55d9
10 changed files with 25 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
awx/ui/client/src/configuration/auth-form/configuration-auth.controller.js
View File

@@ -158,7 +158,8 @@ export default [
toggleSource: key, toggleSource: key,
dataPlacement: 'top', dataPlacement: 'top',
placeholder: ConfigurationUtils.formatPlaceholder($scope.$parent.configDataResolve[key].placeholder, key) || null, placeholder: ConfigurationUtils.formatPlaceholder($scope.$parent.configDataResolve[key].placeholder, key) || null,
dataTitle: $scope.$parent.configDataResolve[key].label dataTitle: $scope.$parent.configDataResolve[key].label,
required: $scope.$parent.configDataResolve[key].required
}); });
} }

7
awx/ui/client/src/configuration/configuration.controller.js
View File

@@ -284,7 +284,12 @@ export default [
if($scope[key] === null) { if($scope[key] === null) {
payload[key] = null; payload[key] = null;
} else if($scope[key][0] && $scope[key][0].value !== undefined) { } else if($scope[key][0] && $scope[key][0].value !== undefined) {
payload[key] = _.map($scope[key], 'value').join(','); if(multiselectDropdowns.indexOf(key) !== -1) {
// Handle AD_HOC_COMMANDS
payload[key] = ConfigurationUtils.listToArray(_.map($scope[key], 'value').join(','));
} else {
payload[key] = _.map($scope[key], 'value').join(',');
}
} else { } else {
payload[key] = $scope[key].value; payload[key] = $scope[key].value;
} }

14
awx/ui/client/src/configuration/configurationUtils.service.js
View File

@@ -13,7 +13,11 @@ export default [
//Parse multiline input //Parse multiline input
return input.replace(/^\s+|\s+$/g, "").split('\n'); return input.replace(/^\s+|\s+$/g, "").split('\n');
} else { } else {
return input.replace(/^\s+|\s+$/g, "").split(/\s*,\s*/); if (input === '') {
return [];
} else {
return input.replace(/^\s+|\s+$/g, "").split(/\s*,\s*/);
}
} }
}, },
@@ -41,15 +45,15 @@ export default [
}, },
formatPlaceholder: function(input) { formatPlaceholder: function(input) {
if(input !== null && typeof input === 'object') { if (input !== null && typeof input === 'object') {
if(Array.isArray(input)) { if (Array.isArray(input)) {
var multiLineInput = false; var multiLineInput = false;
_.each(input, function(statement) { _.each(input, function(statement) {
if(statement.indexOf(',') !== -1) { if (statement.indexOf(',') !== -1) {
multiLineInput = true; multiLineInput = true;
} }
}); });
if(multiLineInput === false) { if (multiLineInput === false) {
return input.join(', '); return input.join(', ');
} else { } else {
return input.join('\n'); return input.join('\n');

3
awx/ui/client/src/configuration/jobs-form/configuration-jobs.controller.js
View File

@@ -47,7 +47,8 @@ export default [
name: key, name: key,
toggleSource: key, toggleSource: key,
dataPlacement: 'top', dataPlacement: 'top',
dataTitle: $scope.$parent.configDataResolve[key].label dataTitle: $scope.$parent.configDataResolve[key].label,
required: $scope.$parent.configDataResolve[key].required
}); });
} }

2
awx/ui/client/src/configuration/jobs-form/configuration-jobs.form.js
View File

@@ -60,7 +60,7 @@
}, },
save: { save: {
ngClick: 'vm.formSave()', ngClick: 'vm.formSave()',
// ngDisabled: true ngDisabled: true
} }
} }
}; };

3
awx/ui/client/src/configuration/system-form/configuration-system.controller.js
View File

@@ -25,7 +25,8 @@ export default [
name: key, name: key,
toggleSource: key, toggleSource: key,
dataPlacement: 'top', dataPlacement: 'top',
dataTitle: $scope.$parent.configDataResolve[key].label dataTitle: $scope.$parent.configDataResolve[key].label,
required: $scope.$parent.configDataResolve[key].required
}); });
} }

2
awx/ui/client/src/configuration/system-form/configuration-system.form.js
View File

@@ -14,8 +14,6 @@ export default function() {
TOWER_URL_BASE: { TOWER_URL_BASE: {
type: 'text', type: 'text',
reset: 'TOWER_URL_BASE', reset: 'TOWER_URL_BASE',
addRequired: false,
editRequird: false,
}, },
TOWER_ADMIN_ALERTS: { TOWER_ADMIN_ALERTS: {
type: 'toggleSwitch', type: 'toggleSwitch',

3
awx/ui/client/src/configuration/ui-form/configuration-ui.controller.js
View File

@@ -50,7 +50,8 @@
name: key, name: key,
toggleSource: key, toggleSource: key,
dataPlacement: 'top', dataPlacement: 'top',
dataTitle: $scope.$parent.configDataResolve[key].label dataTitle: $scope.$parent.configDataResolve[key].label,
required: $scope.$parent.configDataResolve[key].required
}); });
} }

2
awx/ui/client/src/configuration/ui-form/configuration-ui.form.js
View File

@@ -16,7 +16,7 @@
ngChange: 'changedPendo()', ngChange: 'changedPendo()',
ngOptions: 'choice.label for choice in PENDO_TRACKING_STATE_options track by choice.value', ngOptions: 'choice.label for choice in PENDO_TRACKING_STATE_options track by choice.value',
reset: 'PENDO_TRACKING_STATE' reset: 'PENDO_TRACKING_STATE'
}, }
}, },
buttons: { buttons: {

16
awx/ui/client/src/shared/form-generator.js
View File

@@ -282,22 +282,6 @@ angular.module('FormGenerator', [GeneratorHelpers.name, 'Utilities', listGenerat
$(this).remove(); $(this).remove();
}); });
// // Prepend an asterisk to required field label
// $('.form-control[required], input[type="radio"][required]').each(function () {
// var label, span;
// if (Empty($(this).attr('aw-required-when'))) {
// label = $(this).closest('.form-group').find('label').first();
// if (label.length > 0) {
// span = label.children('span');
// if (span.length > 0 && !span.first().hasClass('prepend-asterisk')) {
// span.first().addClass('prepend-asterisk');
// } else if (span.length <= 0 && !label.first().hasClass('prepend-asterisk')) {
// label.first().addClass('prepend-asterisk');
// }
// }
// }
// });
try { try {
$('#help-modal').empty().dialog('destroy'); $('#help-modal').empty().dialog('destroy');
} catch (e) { } catch (e) {