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

Use string interpolation rather than passing action text in via a var

Browse Source
This commit is contained in:
mabashian
2018-04-25 11:41:20 -04:00
parent 82f2783c97
commit cf38faa899
6 changed files with 5 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
awx/ui/client/src/scheduler/schedulerAdd.controller.js
View File

@@ -33,6 +33,7 @@ export default ['$filter', '$state', '$stateParams', '$http', 'Wait',
}; };
$scope.preventCredsWithPasswords = true; $scope.preventCredsWithPasswords = true;
$scope.strings = TemplatesStrings;
/* /*
* This is a workaround for the angular-scheduler library inserting `ll` into fields after an * This is a workaround for the angular-scheduler library inserting `ll` into fields after an
@@ -88,8 +89,6 @@ export default ['$filter', '$state', '$stateParams', '$http', 'Wait',
$scope.hideForm = true; $scope.hideForm = true;
$scope.promptActionText = TemplatesStrings.get('prompt.CONFIRM');
// extra_data field is not manifested in the UI when scheduling a Management Job // extra_data field is not manifested in the UI when scheduling a Management Job
if ($state.current.name === 'jobTemplateSchedules.add'){ if ($state.current.name === 'jobTemplateSchedules.add'){
$scope.parseType = 'yaml'; $scope.parseType = 'yaml';

2
awx/ui/client/src/scheduler/schedulerEdit.controller.js
View File

@@ -21,7 +21,7 @@ function($filter, $state, $stateParams, Wait, $scope, moment,
$scope.hideForm = true; $scope.hideForm = true;
$scope.parseType = 'yaml'; $scope.parseType = 'yaml';
$scope.promptActionText = TemplatesStrings.get('prompt.CONFIRM'); $scope.strings = TemplatesStrings;
$scope.processSchedulerEndDt = function(){ $scope.processSchedulerEndDt = function(){
// set the schedulerEndDt to be equal to schedulerStartDt + 1 day @ midnight // set the schedulerEndDt to be equal to schedulerStartDt + 1 day @ midnight

2
awx/ui/client/src/scheduler/schedulerForm.partial.html
View File

@@ -686,5 +686,5 @@
ng-disabled="!schedulerIsValid || promptModalMissingReqFields"> Save</button> ng-disabled="!schedulerIsValid || promptModalMissingReqFields"> Save</button>
</div> </div>
</div> </div>
<prompt prompt-data="promptData" action-text="promptActionText" prevent-creds-with-passwords="preventCredsWithPasswords"></prompt> <prompt prompt-data="promptData" action-text="{{:: strings.get('prompt.CONFIRM')}}" prevent-creds-with-passwords="preventCredsWithPasswords"></prompt>
</div> </div>

2
awx/ui/client/src/templates/prompt/prompt.directive.js
View File

@@ -5,7 +5,7 @@ export default [ 'templateUrl',
scope: { scope: {
promptData: '=', promptData: '=',
onFinish: '&', onFinish: '&',
actionText: '@actionText', actionText: '@',
preventCredsWithPasswords: '<' preventCredsWithPasswords: '<'
}, },
templateUrl: templateUrl('templates/prompt/prompt'), templateUrl: templateUrl('templates/prompt/prompt'),

2
awx/ui/client/src/templates/workflows/workflow-maker/workflow-maker.controller.js
View File

@@ -16,8 +16,6 @@ export default ['$scope', 'WorkflowService', 'GetBasePath', 'TemplatesService',
$scope.strings = TemplatesStrings; $scope.strings = TemplatesStrings;
$scope.preventCredsWithPasswords = true; $scope.preventCredsWithPasswords = true;
$scope.promptActionText = $scope.strings.get('prompt.CONFIRM');
$scope.workflowMakerFormConfig = { $scope.workflowMakerFormConfig = {
nodeMode: "idle", nodeMode: "idle",
activeTab: "jobs", activeTab: "jobs",

2
awx/ui/client/src/templates/workflows/workflow-maker/workflow-maker.partial.html
View File

@@ -129,5 +129,5 @@
<button type="button" class="btn btn-sm WorkflowMaker-cancelButton" ng-click="closeWorkflowMaker()"> Close</button> <button type="button" class="btn btn-sm WorkflowMaker-cancelButton" ng-click="closeWorkflowMaker()"> Close</button>
<button type="button" class="btn btn-sm WorkflowMaker-saveButton" ng-click="saveWorkflowMaker()" ng-show="workflowJobTemplateObj.summary_fields.user_capabilities.edit || canAddWorkflowJobTemplate" ng-disabled="edgeFlags.conflict || workflowMakerFormConfig.nodeMode === 'add'"> Save</button> <button type="button" class="btn btn-sm WorkflowMaker-saveButton" ng-click="saveWorkflowMaker()" ng-show="workflowJobTemplateObj.summary_fields.user_capabilities.edit || canAddWorkflowJobTemplate" ng-disabled="edgeFlags.conflict || workflowMakerFormConfig.nodeMode === 'add'"> Save</button>
</div> </div>
<prompt prompt-data="promptData" action-text="promptActionText" prevent-creds-with-passwords="preventCredsWithPasswords"></prompt> <prompt prompt-data="promptData" action-text="{{:: strings.get('prompt.CONFIRM')}}" prevent-creds-with-passwords="preventCredsWithPasswords"></prompt>
</div> </div>