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

Adjust SCM labels based on SCM type.

Browse Source
This commit is contained in:
Bill Nottingham 2017-07-17 14:31:55 -04:00
parent 1e20c61f05
commit 55de48a964
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
awx/ui/client/src/projects/add/projects-add.controller.js
View File

@ -115,7 +115,7 @@ export default ['$scope', '$location', '$stateParams', 'GenerateForm',
if ($scope.scm_type) {
$scope.pathRequired = ($scope.scm_type.value === 'manual') ? true : false;
$scope.scmRequired = ($scope.scm_type.value !== 'manual') ? true : false;
$scope.scmBranchLabel = ($scope.scm_type.value === 'svn') ? 'Revision #' : 'SCM Branch';
$scope.scmBranchLabel = i18n._('SCM Branch');
// Dynamically update popover values
if ($scope.scm_type.value) {
if(($scope.lookupType === 'insights_credential' && $scope.scm_type.value !== 'insights') || ($scope.lookupType === 'scm_credential' && $scope.scm_type.value === 'insights')) {
@ -134,6 +134,7 @@ export default ['$scope', '$location', '$stateParams', 'GenerateForm',
'SSH. GIT read only protocol (git://) does not use username or password information.'), '<strong>', '</strong>');
$scope.credRequired = false;
$scope.lookupType = 'scm_credential';
$scope.scmBranchLabel = i18n._('SCM Branch/Tag/Commit');
break;
case 'svn':
$scope.credentialLabel = "SCM Credential";
@ -142,6 +143,7 @@ export default ['$scope', '$location', '$stateParams', 'GenerateForm',
'<li>svn+ssh://servername.example.com/path</li></ul>';
$scope.credRequired = false;
$scope.lookupType = 'scm_credential';
$scope.scmBranchLabel = i18n._('Revision #');
break;
case 'hg':
$scope.credentialLabel = "SCM Credential";
@ -153,6 +155,7 @@ export default ['$scope', '$location', '$stateParams', 'GenerateForm',
'If using Bitbucket and SSH, do not supply your Bitbucket username.'), '<strong>', '</strong>');
$scope.credRequired = false;
$scope.lookupType = 'scm_credential';
$scope.scmBranchLabel = i18n._('SCM Branch/Tag/Revision');
break;
case 'insights':
$scope.pathRequired = false;

5
awx/ui/client/src/projects/edit/projects-edit.controller.js
View File

@ -245,7 +245,7 @@ export default ['$scope', '$rootScope', '$stateParams', 'ProjectsForm', 'Rest',
if ($scope.scm_type) {
$scope.pathRequired = ($scope.scm_type.value === 'manual') ? true : false;
$scope.scmRequired = ($scope.scm_type.value !== 'manual') ? true : false;
$scope.scmBranchLabel = ($scope.scm_type.value === 'svn') ? i18n._('Revision #') : i18n._('SCM Branch');
$scope.scmBranchLabel = i18n._('SCM Branch');
// Dynamically update popover values
if ($scope.scm_type.value) {
@ -263,6 +263,7 @@ export default ['$scope', '$rootScope', '$stateParams', 'ProjectsForm', 'Rest',
'SSH. GIT read only protocol (git://) does not use username or password information.'), '<strong>', '</strong>');
$scope.credRequired = false;
$scope.lookupType = 'scm_credential';
$scope.scmBranchLabel = i18n._('SCM Branch/Tag/Commit');
break;
case 'svn':
$scope.credentialLabel = "SCM Credential";
@ -271,6 +272,7 @@ export default ['$scope', '$rootScope', '$stateParams', 'ProjectsForm', 'Rest',
'<li>svn+ssh://servername.example.com/path</li></ul>';
$scope.credRequired = false;
$scope.lookupType = 'scm_credential';
$scope.scmBranchLabel = i18n._('Revision #');
break;
case 'hg':
$scope.credentialLabel = "SCM Credential";
@ -282,6 +284,7 @@ export default ['$scope', '$rootScope', '$stateParams', 'ProjectsForm', 'Rest',
'If using Bitbucket and SSH, do not supply your Bitbucket username.'), '<strong>', '</strong>');
$scope.credRequired = false;
$scope.lookupType = 'scm_credential';
$scope.scmBranchLabel = i18n._('SCM Branch/Tag/Revision');
break;
case 'insights':
$scope.pathRequired = false;