shaba/awx
1
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2024-11-01 16:51:11 +03:00
Code Releases Activity

Remove instances of "md5" from the UI.

Browse Source
This commit is contained in:
kialam 2018-11-19 12:59:15 -05:00
parent a72f3d2f2f
commit d8d89d253d
No known key found for this signature in database
GPG Key ID: 2D0E60E4B8C7EA0F
6 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -79,7 +79,7 @@
* | default | Default value to place in the field when the form is in 'add' mode. | * | default | Default value to place in the field when the form is in 'add' mode. |
* | defaultText | Default value to put into a select input. | * | 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. | * | 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. | * | 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 | * | 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. | * | 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 += (horizontal) ? "class=\"" + getFieldWidth() + "\"" : "";
html += ">\n"; html += ">\n";
html += (field.clear || field.genMD5) ? "<div class=\"input-group Form-mixedInputGroup\">\n" : ""; html += (field.clear || field.genHash) ? "<div class=\"input-group Form-mixedInputGroup\">\n" : "";
if (field.control === null || field.control === undefined || field.control) { if (field.control === null || field.control === undefined || field.control) {
html += "<input "; html += "<input ";
@ -842,8 +842,8 @@ angular.module('FormGenerator', [GeneratorHelpers.name, 'Utilities', listGenerat
html += "</span>\n</div>\n"; html += "</span>\n</div>\n";
} }
if (field.genMD5) { if (field.genHash) {
html += "<span class=\"input-group-btn\"><button type=\"button\" class=\"btn Form-lookupButton\" ng-click=\"genMD5('" + fld + "')\" " + html += "<span class=\"input-group-btn\"><button type=\"button\" class=\"btn Form-lookupButton\" ng-click=\"genHash('" + fld + "')\" " +
"aw-tool-tip=\"Generate " + field.label + "\" data-placement=\"top\" id=\"" + this.form.name + "_" + fld + "_gen_btn\">" + "aw-tool-tip=\"Generate " + field.label + "\" data-placement=\"top\" id=\"" + this.form.name + "_" + fld + "_gen_btn\">" +
"<i class=\"fa fa-magic\"></i></button></span>\n</div>\n"; "<i class=\"fa fa-magic\"></i></button></span>\n</div>\n";
} }

6
awx/ui/client/src/templates/job_templates/add-job-template/job-template-add.controller.js
View File

@ -7,14 +7,14 @@
export default export default
[ '$filter', '$scope', [ '$filter', '$scope',
'$stateParams', 'JobTemplateForm', 'GenerateForm', 'Rest', 'Alert', '$stateParams', 'JobTemplateForm', 'GenerateForm', 'Rest', 'Alert',
'ProcessErrors', 'GetBasePath', 'md5Setup', 'ParseTypeChange', 'Wait', 'ProcessErrors', 'GetBasePath', 'hashSetup', 'ParseTypeChange', 'Wait',
'Empty', 'ToJSON', 'CallbackHelpInit', 'GetChoices', '$state', 'availableLabels', 'Empty', 'ToJSON', 'CallbackHelpInit', 'GetChoices', '$state', 'availableLabels',
'CreateSelect2', '$q', 'i18n', 'Inventory', 'Project', 'InstanceGroupsService', 'CreateSelect2', '$q', 'i18n', 'Inventory', 'Project', 'InstanceGroupsService',
'MultiCredentialService', 'ConfigData', 'resolvedModels', 'MultiCredentialService', 'ConfigData', 'resolvedModels',
function( function(
$filter, $scope, $filter, $scope,
$stateParams, JobTemplateForm, GenerateForm, Rest, Alert, $stateParams, JobTemplateForm, GenerateForm, Rest, Alert,
ProcessErrors, GetBasePath, md5Setup, ParseTypeChange, Wait, ProcessErrors, GetBasePath, hashSetup, ParseTypeChange, Wait,
Empty, ToJSON, CallbackHelpInit, GetChoices, Empty, ToJSON, CallbackHelpInit, GetChoices,
$state, availableLabels, CreateSelect2, $q, i18n, Inventory, Project, InstanceGroupsService, $state, availableLabels, CreateSelect2, $q, i18n, Inventory, Project, InstanceGroupsService,
MultiCredentialService, ConfigData, resolvedModels MultiCredentialService, ConfigData, resolvedModels
@ -43,7 +43,7 @@
$scope.credentialNotPresent = false; $scope.credentialNotPresent = false;
$scope.canGetAllRelatedResources = true; $scope.canGetAllRelatedResources = true;
md5Setup({ hashSetup({
scope: $scope, scope: $scope,
master: master, master: master,
check_field: 'allow_callbacks', check_field: 'allow_callbacks',

6
awx/ui/client/src/templates/job_templates/edit-job-template/job-template-edit.controller.js
View File

@ -13,7 +13,7 @@
export default export default
[ '$filter', '$scope', '$rootScope', [ '$filter', '$scope', '$rootScope',
'$location', '$stateParams', 'JobTemplateForm', 'GenerateForm', '$location', '$stateParams', 'JobTemplateForm', 'GenerateForm',
'Rest', 'Alert', 'ProcessErrors', 'GetBasePath', 'md5Setup', 'Rest', 'Alert', 'ProcessErrors', 'GetBasePath', 'hashSetup',
'ParseTypeChange', 'Wait', 'selectedLabels', 'i18n', 'ParseTypeChange', 'Wait', 'selectedLabels', 'i18n',
'Empty', 'Prompt', 'ToJSON', 'GetChoices', 'CallbackHelpInit', 'Empty', 'Prompt', 'ToJSON', 'GetChoices', 'CallbackHelpInit',
'initSurvey', '$state', 'CreateSelect2', 'initSurvey', '$state', 'CreateSelect2',
@ -23,7 +23,7 @@ export default
function( function(
$filter, $scope, $rootScope, $filter, $scope, $rootScope,
$location, $stateParams, JobTemplateForm, GenerateForm, Rest, Alert, $location, $stateParams, JobTemplateForm, GenerateForm, Rest, Alert,
ProcessErrors, GetBasePath, md5Setup, ProcessErrors, GetBasePath, hashSetup,
ParseTypeChange, Wait, selectedLabels, i18n, ParseTypeChange, Wait, selectedLabels, i18n,
Empty, Prompt, ToJSON, GetChoices, CallbackHelpInit, Empty, Prompt, ToJSON, GetChoices, CallbackHelpInit,
SurveyControllerInit, $state, CreateSelect2, SurveyControllerInit, $state, CreateSelect2,
@ -245,7 +245,7 @@ export default
master = masterObject; master = masterObject;
dft = ($scope.host_config_key === "" || $scope.host_config_key === null) ? false : true; dft = ($scope.host_config_key === "" || $scope.host_config_key === null) ? false : true;
md5Setup({ hashSetup({
scope: $scope, scope: $scope,
master: master, master: master,
check_field: 'allow_callbacks', check_field: 'allow_callbacks',

8
awx/ui/client/src/templates/job_templates/factories/callback-help-init.factory.js
View File

@ -18,11 +18,11 @@ export default
"<p>Successful requests create an entry on the Jobs page, where results and history can be viewed.</p>"; "<p>Successful requests create an entry on the Jobs page, where results and history can be viewed.</p>";
}; };
// The md5 helper emits NewMD5Generated whenever a new key is available // The md5 helper emits NewHashGenerated whenever a new key is available
if (scope.removeNewMD5Generated) { if (scope.removeNewHashGenerated) {
scope.removeNewMD5Generated(); scope.removeNewHashGenerated();
} }
scope.removeNewMD5Generated = scope.$on('NewMD5Generated', function() { scope.removeNewHashGenerated = scope.$on('NewHashGenerated', function() {
scope.configKeyChange(); scope.configKeyChange();
}); });

2
awx/ui/client/src/templates/job_templates/job-template.form.js
View File

@ -353,7 +353,7 @@ function(NotificationsList, i18n) {
type: 'text', type: 'text',
ngShow: "allow_callbacks && allow_callbacks !== 'false'", ngShow: "allow_callbacks && allow_callbacks !== 'false'",
ngChange: "configKeyChange()", ngChange: "configKeyChange()",
genMD5: true, genHash: true,
column: 2, column: 2,
awPopOver: "callback_help", awPopOver: "callback_help",
awPopOverWatch: "callback_help", awPopOverWatch: "callback_help",

4
awx/ui/client/src/templates/job_templates/main.js
View File

@ -1,13 +1,13 @@
import jobTemplateAdd from './add-job-template/main'; import jobTemplateAdd from './add-job-template/main';
import jobTemplateEdit from './edit-job-template/main'; import jobTemplateEdit from './edit-job-template/main';
import multiCredential from './multi-credential/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 CallbackHelpInit from './factories/callback-help-init.factory';
import JobTemplateForm from './job-template.form'; import JobTemplateForm from './job-template.form';
export default export default
angular.module('jobTemplates', [jobTemplateAdd.name, jobTemplateEdit.name, angular.module('jobTemplates', [jobTemplateAdd.name, jobTemplateEdit.name,
multiCredential.name]) multiCredential.name])
.factory('md5Setup', md5Setup) .factory('hashSetup', hashSetup)
.factory('CallbackHelpInit', CallbackHelpInit) .factory('CallbackHelpInit', CallbackHelpInit)
.factory('JobTemplateForm', JobTemplateForm); .factory('JobTemplateForm', JobTemplateForm);