From 200bbf55d92b1203ab6077160291373fe4bfa006 Mon Sep 17 00:00:00 2001 From: Ken Hoes Date: Wed, 30 Nov 2016 09:39:27 -0500 Subject: [PATCH] Fixed merge conflicts --- .../auth-form/configuration-auth.controller.js | 3 ++- .../configuration/configuration.controller.js | 7 ++++++- .../configuration/configurationUtils.service.js | 14 +++++++++----- .../jobs-form/configuration-jobs.controller.js | 3 ++- .../jobs-form/configuration-jobs.form.js | 2 +- .../configuration-system.controller.js | 3 ++- .../system-form/configuration-system.form.js | 2 -- .../ui-form/configuration-ui.controller.js | 3 ++- .../ui-form/configuration-ui.form.js | 2 +- awx/ui/client/src/shared/form-generator.js | 16 ---------------- 10 files changed, 25 insertions(+), 30 deletions(-) diff --git a/awx/ui/client/src/configuration/auth-form/configuration-auth.controller.js b/awx/ui/client/src/configuration/auth-form/configuration-auth.controller.js index 9b0220a135..adecd924f4 100644 --- a/awx/ui/client/src/configuration/auth-form/configuration-auth.controller.js +++ b/awx/ui/client/src/configuration/auth-form/configuration-auth.controller.js @@ -158,7 +158,8 @@ export default [ toggleSource: key, dataPlacement: 'top', 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 }); } diff --git a/awx/ui/client/src/configuration/configuration.controller.js b/awx/ui/client/src/configuration/configuration.controller.js index f35eaa5dc6..5ec6c0abca 100644 --- a/awx/ui/client/src/configuration/configuration.controller.js +++ b/awx/ui/client/src/configuration/configuration.controller.js @@ -284,7 +284,12 @@ export default [ if($scope[key] === null) { payload[key] = null; } 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 { payload[key] = $scope[key].value; } diff --git a/awx/ui/client/src/configuration/configurationUtils.service.js b/awx/ui/client/src/configuration/configurationUtils.service.js index fe8d4f27c0..b8758c308e 100644 --- a/awx/ui/client/src/configuration/configurationUtils.service.js +++ b/awx/ui/client/src/configuration/configurationUtils.service.js @@ -13,7 +13,11 @@ export default [ //Parse multiline input return input.replace(/^\s+|\s+$/g, "").split('\n'); } 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) { - if(input !== null && typeof input === 'object') { - if(Array.isArray(input)) { + if (input !== null && typeof input === 'object') { + if (Array.isArray(input)) { var multiLineInput = false; _.each(input, function(statement) { - if(statement.indexOf(',') !== -1) { + if (statement.indexOf(',') !== -1) { multiLineInput = true; } }); - if(multiLineInput === false) { + if (multiLineInput === false) { return input.join(', '); } else { return input.join('\n'); diff --git a/awx/ui/client/src/configuration/jobs-form/configuration-jobs.controller.js b/awx/ui/client/src/configuration/jobs-form/configuration-jobs.controller.js index b0b4631adf..ea2945ab75 100644 --- a/awx/ui/client/src/configuration/jobs-form/configuration-jobs.controller.js +++ b/awx/ui/client/src/configuration/jobs-form/configuration-jobs.controller.js @@ -47,7 +47,8 @@ export default [ name: key, toggleSource: key, dataPlacement: 'top', - dataTitle: $scope.$parent.configDataResolve[key].label + dataTitle: $scope.$parent.configDataResolve[key].label, + required: $scope.$parent.configDataResolve[key].required }); } diff --git a/awx/ui/client/src/configuration/jobs-form/configuration-jobs.form.js b/awx/ui/client/src/configuration/jobs-form/configuration-jobs.form.js index d4a80ad056..db84e4233d 100644 --- a/awx/ui/client/src/configuration/jobs-form/configuration-jobs.form.js +++ b/awx/ui/client/src/configuration/jobs-form/configuration-jobs.form.js @@ -60,7 +60,7 @@ }, save: { ngClick: 'vm.formSave()', - // ngDisabled: true + ngDisabled: true } } }; diff --git a/awx/ui/client/src/configuration/system-form/configuration-system.controller.js b/awx/ui/client/src/configuration/system-form/configuration-system.controller.js index 99091e7af1..340e452870 100644 --- a/awx/ui/client/src/configuration/system-form/configuration-system.controller.js +++ b/awx/ui/client/src/configuration/system-form/configuration-system.controller.js @@ -25,7 +25,8 @@ export default [ name: key, toggleSource: key, dataPlacement: 'top', - dataTitle: $scope.$parent.configDataResolve[key].label + dataTitle: $scope.$parent.configDataResolve[key].label, + required: $scope.$parent.configDataResolve[key].required }); } diff --git a/awx/ui/client/src/configuration/system-form/configuration-system.form.js b/awx/ui/client/src/configuration/system-form/configuration-system.form.js index c7ef1a2cd8..d0e4cc9d2b 100644 --- a/awx/ui/client/src/configuration/system-form/configuration-system.form.js +++ b/awx/ui/client/src/configuration/system-form/configuration-system.form.js @@ -14,8 +14,6 @@ export default function() { TOWER_URL_BASE: { type: 'text', reset: 'TOWER_URL_BASE', - addRequired: false, - editRequird: false, }, TOWER_ADMIN_ALERTS: { type: 'toggleSwitch', diff --git a/awx/ui/client/src/configuration/ui-form/configuration-ui.controller.js b/awx/ui/client/src/configuration/ui-form/configuration-ui.controller.js index d50239fce5..103c9b8040 100644 --- a/awx/ui/client/src/configuration/ui-form/configuration-ui.controller.js +++ b/awx/ui/client/src/configuration/ui-form/configuration-ui.controller.js @@ -50,7 +50,8 @@ name: key, toggleSource: key, dataPlacement: 'top', - dataTitle: $scope.$parent.configDataResolve[key].label + dataTitle: $scope.$parent.configDataResolve[key].label, + required: $scope.$parent.configDataResolve[key].required }); } diff --git a/awx/ui/client/src/configuration/ui-form/configuration-ui.form.js b/awx/ui/client/src/configuration/ui-form/configuration-ui.form.js index 6b222f5805..9c1805d2c9 100644 --- a/awx/ui/client/src/configuration/ui-form/configuration-ui.form.js +++ b/awx/ui/client/src/configuration/ui-form/configuration-ui.form.js @@ -16,7 +16,7 @@ ngChange: 'changedPendo()', ngOptions: 'choice.label for choice in PENDO_TRACKING_STATE_options track by choice.value', reset: 'PENDO_TRACKING_STATE' - }, + } }, buttons: { diff --git a/awx/ui/client/src/shared/form-generator.js b/awx/ui/client/src/shared/form-generator.js index 25e2204de9..5866a464ba 100644 --- a/awx/ui/client/src/shared/form-generator.js +++ b/awx/ui/client/src/shared/form-generator.js @@ -282,22 +282,6 @@ angular.module('FormGenerator', [GeneratorHelpers.name, 'Utilities', listGenerat $(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 { $('#help-modal').empty().dialog('destroy'); } catch (e) {