External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-05-20 07:17:40 -02:30
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6685 from mabashian/5626-scm-type-error

Browse Source 
Fixed scm type js error
This commit is contained in:
Michael Abashian
2017-06-22 12:26:50 -04:00
committed by GitHub
parent 922ffa905c 8327a8dc09
commit 9cd1330161
2 changed files with 74 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -116,7 +116,6 @@ export default ['$scope', '$location', '$stateParams', 'GenerateForm',
$scope.pathRequired = ($scope.scm_type.value === 'manual') ? true : false; $scope.pathRequired = ($scope.scm_type.value === 'manual') ? true : false;
$scope.scmRequired = ($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 = ($scope.scm_type.value === 'svn') ? 'Revision #' : 'SCM Branch';
}
// Dynamically update popover values // Dynamically update popover values
if ($scope.scm_type.value) { if ($scope.scm_type.value) {
@@ -157,7 +156,7 @@ export default ['$scope', '$location', '$stateParams', 'GenerateForm',
$scope.urlPopover = '<p> ' + i18n._('URL popover text') + '</p>'; $scope.urlPopover = '<p> ' + i18n._('URL popover text') + '</p>';
} }
} }
}
}; };
$scope.formCancel = function() { $scope.formCancel = function() {
$state.go('projects'); $state.go('projects');

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

@@ -248,7 +248,6 @@ export default ['$scope', '$rootScope', '$stateParams', 'ProjectsForm', 'Rest',
$scope.pathRequired = ($scope.scm_type.value === 'manual') ? true : false; $scope.pathRequired = ($scope.scm_type.value === 'manual') ? true : false;
$scope.scmRequired = ($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 = ($scope.scm_type.value === 'svn') ? i18n._('Revision #') : i18n._('SCM Branch');
}
// Dynamically update popover values // Dynamically update popover values
if ($scope.scm_type.value) { if ($scope.scm_type.value) {
@@ -287,6 +286,7 @@ export default ['$scope', '$rootScope', '$stateParams', 'ProjectsForm', 'Rest',
$scope.urlPopover = '<p> ' + i18n._('URL popover text'); $scope.urlPopover = '<p> ' + i18n._('URL popover text');
} }
} }
}
}; };
$scope.lookupCredential = function(){ $scope.lookupCredential = function(){