External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-01-15 20:00:43 -03:30
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3546 from jlmitch5/fixLaunchButtonPositioning

Browse Source 
move wf and jt form launch buttons to the left instead of the right

Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]
This commit is contained in:
softwarefactory-project-zuul[bot] 2019-04-03 14:49:13 +00:00 committed by GitHub
commit bf0f1f1496
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -393,6 +393,13 @@ function(NotificationsList, i18n) {
},
buttons: { //for now always generates <button> tags
launch: {
component: 'at-launch-template',
templateObj: 'job_template_obj',
ngShow: '(job_template_obj.summary_fields.user_capabilities.start || canAddJobTemplate)',
ngDisabled: 'disableLaunch || job_template_form.$dirty',
showTextButton: 'true'
},
cancel: {
ngClick: 'formCancel()',
ngShow: '(job_template_obj.summary_fields.user_capabilities.edit || canAddJobTemplate)'
@ -405,13 +412,6 @@ function(NotificationsList, i18n) {
ngClick: 'formSave()', //$scope.function to call on click, optional
ngDisabled: "job_template_form.$invalid",//true //Disable when $pristine or $invalid, optional and when can_edit = false, for permission reasons
ngShow: '(job_template_obj.summary_fields.user_capabilities.edit || canAddJobTemplate)'
},
launch: {
component: 'at-launch-template',
templateObj: 'job_template_obj',
ngShow: '(job_template_obj.summary_fields.user_capabilities.start || canAddJobTemplate)',
ngDisabled: 'disableLaunch || job_template_form.$dirty',
showTextButton: 'true'
}
},

14
awx/ui/client/src/templates/workflows.form.js
View File

@ -139,6 +139,13 @@ export default ['NotificationsList', 'i18n', function(NotificationsList, i18n) {
},
buttons: { //for now always generates <button> tags
launch: {
component: 'at-launch-template',
templateObj: 'workflow_job_template_obj',
ngShow: '(workflow_job_template_obj.summary_fields.user_capabilities.start || canAddWorkflowJobTemplate)',
ngDisabled: 'disableLaunch || workflow_job_template_form.$dirty',
showTextButton: 'true'
},
cancel: {
ngClick: 'formCancel()',
ngShow: '(workflow_job_template_obj.summary_fields.user_capabilities.edit || canAddWorkflowJobTemplate)'
@ -151,13 +158,6 @@ export default ['NotificationsList', 'i18n', function(NotificationsList, i18n) {
ngClick: 'formSave()', //$scope.function to call on click, optional
ngDisabled: "workflow_job_template_form.$invalid || can_edit!==true", //Disable when $pristine or $invalid, optional and when can_edit = false, for permission reasons
ngShow: '(workflow_job_template_obj.summary_fields.user_capabilities.edit || canAddWorkflowJobTemplate)'
},
launch: {
component: 'at-launch-template',
templateObj: 'workflow_job_template_obj',
ngShow: '(workflow_job_template_obj.summary_fields.user_capabilities.start || canAddWorkflowJobTemplate)',
ngDisabled: 'disableLaunch || workflow_job_template_form.$dirty',
showTextButton: 'true'
}
},