diff --git a/awx/ui/client/src/shared/form-generator.js b/awx/ui/client/src/shared/form-generator.js index f9e1b9e426..d3c8516032 100644 --- a/awx/ui/client/src/shared/form-generator.js +++ b/awx/ui/client/src/shared/form-generator.js @@ -79,7 +79,7 @@ * | default | Default value to place in the field when the form is in 'add' mode. | * | defaultText | Default value to put into a select input. | * | falseValue | For radio buttons and checkboxes. Value to set the model to when the checkbox or radio button is not selected. | - * | genMD5 | true or false. If true, places the field in an input group with a button that when clicked replaces the field contents with an MD5 has key. Used with host_config_key on the job templates detail page. | + * | genHash | true or false. If true, places the field in an input group with a button that when clicked replaces the field contents with a hash as key. Used with host_config_key on the job templates detail page. | * | integer | Adds the integer directive to validate that the value entered is of type integer. Add min and max to supply lower and upper range bounds to the entered value. | * | label | Text to use as <label> element for the field | * | ngChange | Adds ng-change directive. Set to the JS expression to be evaluated by ng-change. | @@ -802,7 +802,7 @@ angular.module('FormGenerator', [GeneratorHelpers.name, 'Utilities', listGenerat html += (horizontal) ? "class=\"" + getFieldWidth() + "\"" : ""; html += ">\n"; - html += (field.clear || field.genMD5) ? "
\n" : ""; + html += (field.clear || field.genHash) ? "
\n" : ""; if (field.control === null || field.control === undefined || field.control) { html += "\n
\n"; } diff --git a/awx/ui/client/src/templates/job_templates/add-job-template/job-template-add.controller.js b/awx/ui/client/src/templates/job_templates/add-job-template/job-template-add.controller.js index 1ee7f244ea..097b905699 100644 --- a/awx/ui/client/src/templates/job_templates/add-job-template/job-template-add.controller.js +++ b/awx/ui/client/src/templates/job_templates/add-job-template/job-template-add.controller.js @@ -7,14 +7,14 @@ export default [ '$filter', '$scope', '$stateParams', 'JobTemplateForm', 'GenerateForm', 'Rest', 'Alert', - 'ProcessErrors', 'GetBasePath', 'md5Setup', 'ParseTypeChange', 'Wait', + 'ProcessErrors', 'GetBasePath', 'hashSetup', 'ParseTypeChange', 'Wait', 'Empty', 'ToJSON', 'CallbackHelpInit', 'GetChoices', '$state', 'availableLabels', 'CreateSelect2', '$q', 'i18n', 'Inventory', 'Project', 'InstanceGroupsService', 'MultiCredentialService', 'ConfigData', 'resolvedModels', function( $filter, $scope, $stateParams, JobTemplateForm, GenerateForm, Rest, Alert, - ProcessErrors, GetBasePath, md5Setup, ParseTypeChange, Wait, + ProcessErrors, GetBasePath, hashSetup, ParseTypeChange, Wait, Empty, ToJSON, CallbackHelpInit, GetChoices, $state, availableLabels, CreateSelect2, $q, i18n, Inventory, Project, InstanceGroupsService, MultiCredentialService, ConfigData, resolvedModels @@ -43,7 +43,7 @@ $scope.credentialNotPresent = false; $scope.canGetAllRelatedResources = true; - md5Setup({ + hashSetup({ scope: $scope, master: master, check_field: 'allow_callbacks', diff --git a/awx/ui/client/src/templates/job_templates/edit-job-template/job-template-edit.controller.js b/awx/ui/client/src/templates/job_templates/edit-job-template/job-template-edit.controller.js index 1b6b4a1c99..b2f88af137 100644 --- a/awx/ui/client/src/templates/job_templates/edit-job-template/job-template-edit.controller.js +++ b/awx/ui/client/src/templates/job_templates/edit-job-template/job-template-edit.controller.js @@ -13,7 +13,7 @@ export default [ '$filter', '$scope', '$rootScope', '$location', '$stateParams', 'JobTemplateForm', 'GenerateForm', - 'Rest', 'Alert', 'ProcessErrors', 'GetBasePath', 'md5Setup', + 'Rest', 'Alert', 'ProcessErrors', 'GetBasePath', 'hashSetup', 'ParseTypeChange', 'Wait', 'selectedLabels', 'i18n', 'Empty', 'Prompt', 'ToJSON', 'GetChoices', 'CallbackHelpInit', 'initSurvey', '$state', 'CreateSelect2', @@ -23,7 +23,7 @@ export default function( $filter, $scope, $rootScope, $location, $stateParams, JobTemplateForm, GenerateForm, Rest, Alert, - ProcessErrors, GetBasePath, md5Setup, + ProcessErrors, GetBasePath, hashSetup, ParseTypeChange, Wait, selectedLabels, i18n, Empty, Prompt, ToJSON, GetChoices, CallbackHelpInit, SurveyControllerInit, $state, CreateSelect2, @@ -245,7 +245,7 @@ export default master = masterObject; dft = ($scope.host_config_key === "" || $scope.host_config_key === null) ? false : true; - md5Setup({ + hashSetup({ scope: $scope, master: master, check_field: 'allow_callbacks', diff --git a/awx/ui/client/src/templates/job_templates/factories/callback-help-init.factory.js b/awx/ui/client/src/templates/job_templates/factories/callback-help-init.factory.js index e1c027a4e0..2f6d184289 100644 --- a/awx/ui/client/src/templates/job_templates/factories/callback-help-init.factory.js +++ b/awx/ui/client/src/templates/job_templates/factories/callback-help-init.factory.js @@ -18,11 +18,11 @@ export default "

Successful requests create an entry on the Jobs page, where results and history can be viewed.

"; }; - // The md5 helper emits NewMD5Generated whenever a new key is available - if (scope.removeNewMD5Generated) { - scope.removeNewMD5Generated(); + // The md5 helper emits NewHashGenerated whenever a new key is available + if (scope.removeNewHashGenerated) { + scope.removeNewHashGenerated(); } - scope.removeNewMD5Generated = scope.$on('NewMD5Generated', function() { + scope.removeNewHashGenerated = scope.$on('NewHashGenerated', function() { scope.configKeyChange(); }); diff --git a/awx/ui/client/src/templates/job_templates/job-template.form.js b/awx/ui/client/src/templates/job_templates/job-template.form.js index f716cb4abb..673a5880d5 100644 --- a/awx/ui/client/src/templates/job_templates/job-template.form.js +++ b/awx/ui/client/src/templates/job_templates/job-template.form.js @@ -353,7 +353,7 @@ function(NotificationsList, i18n) { type: 'text', ngShow: "allow_callbacks && allow_callbacks !== 'false'", ngChange: "configKeyChange()", - genMD5: true, + genHash: true, column: 2, awPopOver: "callback_help", awPopOverWatch: "callback_help", diff --git a/awx/ui/client/src/templates/job_templates/main.js b/awx/ui/client/src/templates/job_templates/main.js index 82d254cfb4..0c096c0134 100644 --- a/awx/ui/client/src/templates/job_templates/main.js +++ b/awx/ui/client/src/templates/job_templates/main.js @@ -1,13 +1,13 @@ import jobTemplateAdd from './add-job-template/main'; import jobTemplateEdit from './edit-job-template/main'; import multiCredential from './multi-credential/main'; -import md5Setup from './factories/md-5-setup.factory'; +import hashSetup from './factories/hash-setup.factory'; import CallbackHelpInit from './factories/callback-help-init.factory'; import JobTemplateForm from './job-template.form'; export default angular.module('jobTemplates', [jobTemplateAdd.name, jobTemplateEdit.name, multiCredential.name]) - .factory('md5Setup', md5Setup) + .factory('hashSetup', hashSetup) .factory('CallbackHelpInit', CallbackHelpInit) .factory('JobTemplateForm', JobTemplateForm);