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

Projects form -> edit / SCM fix

Browse Source 
The manual scm option was not showing up when editing an existing project
This commit is contained in:
Jared Tabor
2014-12-05 11:06:34 -05:00
parent 224e136269
commit 5eb4b59745
1 changed files with 17 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
awx/ui/static/js/controllers/Projects.js
View File

@@ -549,7 +549,7 @@ function ProjectsEdit($scope, $rootScope, $compile, $location, $log, $routeParam
generator = GenerateForm, generator = GenerateForm,
defaultUrl = GetBasePath('projects') + $routeParams.id + '/', defaultUrl = GetBasePath('projects') + $routeParams.id + '/',
base = $location.path().replace(/^\//, '').split('/')[0], base = $location.path().replace(/^\//, '').split('/')[0],
master = {}, master = {}, i,
id = $routeParams.id, id = $routeParams.id,
relatedSets = {}; relatedSets = {};
@@ -614,8 +614,8 @@ function ProjectsEdit($scope, $rootScope, $compile, $location, $log, $routeParam
input_type: 'radio' input_type: 'radio'
}); });
$scope.pathRequired = ($scope.scm_type.value === '') ? true : false; $scope.pathRequired = ($scope.scm_type.value === 'manual') ? true : false;
$scope.scmRequired = ($scope.scm_type.value !== '') ? 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';
Wait('stop'); Wait('stop');
}); });
@@ -624,6 +624,12 @@ function ProjectsEdit($scope, $rootScope, $compile, $location, $log, $routeParam
$scope.removeChoicesReady(); $scope.removeChoicesReady();
} }
$scope.removeChoicesReady = $scope.$on('choicesReady', function () { $scope.removeChoicesReady = $scope.$on('choicesReady', function () {
for (i = 0; i < $scope.scm_type_options.length; i++) {
if ($scope.scm_type_options[i].value === '') {
$scope.scm_type_options[i].value = "manual";
break;
}
}
// Retrieve detail record and prepopulate the form // Retrieve detail record and prepopulate the form
Rest.setUrl(defaultUrl); Rest.setUrl(defaultUrl);
Rest.get({ params: { id: id } }) Rest.get({ params: { id: id } })
@@ -653,8 +659,9 @@ function ProjectsEdit($scope, $rootScope, $compile, $location, $log, $routeParam
relatedSets = form.relatedSets(data.related); relatedSets = form.relatedSets(data.related);
data.scm_type = (Empty(data.scm_type)) ? '' : data.scm_type;
data.scm_type = (Empty(data.scm_type)) ? 'manual' : data.scm_type;
for (i = 0; i < $scope.scm_type_options.length; i++) { for (i = 0; i < $scope.scm_type_options.length; i++) {
if ($scope.scm_type_options[i].value === data.scm_type) { if ($scope.scm_type_options[i].value === data.scm_type) {
$scope.scm_type = $scope.scm_type_options[i]; $scope.scm_type = $scope.scm_type_options[i];
@@ -662,7 +669,7 @@ function ProjectsEdit($scope, $rootScope, $compile, $location, $log, $routeParam
} }
} }
if ($scope.scm_type.value !== '') { if ($scope.scm_type.value !== 'manual') {
$scope.pathRequired = false; $scope.pathRequired = false;
$scope.scmRequired = true; $scope.scmRequired = true;
} else { } else {
@@ -758,7 +765,9 @@ function ProjectsEdit($scope, $rootScope, $compile, $location, $log, $routeParam
} }
} }
params.scm_type = $scope.scm_type.value; if(params.scm_type.value === 'manual'){
params.scm_type = '';
} else params.scm_type = $scope.scm_type.value;
if ($scope.scm_type.value !== '') { if ($scope.scm_type.value !== '') {
delete params.local_path; delete params.local_path;
} else { } else {
@@ -824,8 +833,8 @@ function ProjectsEdit($scope, $rootScope, $compile, $location, $log, $routeParam
$scope.scmChange = function () { $scope.scmChange = function () {
if ($scope.scm_type) { if ($scope.scm_type) {
$scope.pathRequired = ($scope.scm_type.value === '') ? true : false; $scope.pathRequired = ($scope.scm_type.value === 'manual') ? true : false;
$scope.scmRequired = ($scope.scm_type.value !== '') ? 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';
} }
}; };