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

make org field populate on edit of project

Browse Source
This commit is contained in:
John Mitchell
2016-04-04 14:14:41 -04:00
parent 67f42eba8e
commit 3226c2f10e
1 changed files with 15 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
awx/ui/client/src/controllers/Projects.js
View File

@@ -516,7 +516,8 @@ export function ProjectsEdit($scope, $rootScope, $compile, $location, $log,
RelatedSearchInit, RelatedPaginateInit, Prompt, ClearScope, GetBasePath, RelatedSearchInit, RelatedPaginateInit, Prompt, ClearScope, GetBasePath,
ReturnToCaller, GetProjectPath, Authorization, CredentialList, LookUpInit, ReturnToCaller, GetProjectPath, Authorization, CredentialList, LookUpInit,
GetChoices, Empty, DebugForm, Wait, SchedulesControllerInit, GetChoices, Empty, DebugForm, Wait, SchedulesControllerInit,
SchedulesListInit, SchedulesList, ProjectUpdate, $state, CreateSelect2) { SchedulesListInit, SchedulesList, ProjectUpdate, $state, CreateSelect2,
OrganizationList) {
ClearScope('htmlTemplate'); ClearScope('htmlTemplate');
@@ -590,6 +591,15 @@ export function ProjectsEdit($scope, $rootScope, $compile, $location, $log,
input_type: 'radio' input_type: 'radio'
}); });
LookUpInit({
scope: $scope,
form: form,
current_item: $scope.organization,
list: OrganizationList,
field: 'organization',
input_type: 'radio'
});
$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';
@@ -623,9 +633,9 @@ export function ProjectsEdit($scope, $rootScope, $compile, $location, $log,
master[fld] = data[fld]; master[fld] = data[fld];
} }
} }
if (fld !== 'organization' && form.fields[fld].sourceModel && if (form.fields[fld].sourceModel && data.summary_fields &&
data.summary_fields && data.summary_fields[form.fields[fld].sourceModel]) { data.summary_fields[form.fields[fld].sourceModel]) {
$scope[form.fields[fld].sourceModel + '_' + form.fields[fld].sourceField] = $scope[form.fields[fld].sourceModel + '_' + form.fields[fld].sourceField] =
data.summary_fields[form.fields[fld].sourceModel][form.fields[fld].sourceField]; data.summary_fields[form.fields[fld].sourceModel][form.fields[fld].sourceField];
master[form.fields[fld].sourceModel + '_' + form.fields[fld].sourceField] = master[form.fields[fld].sourceModel + '_' + form.fields[fld].sourceField] =
data.summary_fields[form.fields[fld].sourceModel][form.fields[fld].sourceField]; data.summary_fields[form.fields[fld].sourceModel][form.fields[fld].sourceField];
@@ -810,5 +820,5 @@ ProjectsEdit.$inject = ['$scope', '$rootScope', '$compile', '$location', '$log',
'ClearScope', 'GetBasePath', 'ReturnToCaller', 'GetProjectPath', 'ClearScope', 'GetBasePath', 'ReturnToCaller', 'GetProjectPath',
'Authorization', 'CredentialList', 'LookUpInit', 'GetChoices', 'Empty', 'Authorization', 'CredentialList', 'LookUpInit', 'GetChoices', 'Empty',
'DebugForm', 'Wait', 'SchedulesControllerInit', 'SchedulesListInit', 'DebugForm', 'Wait', 'SchedulesControllerInit', 'SchedulesListInit',
'SchedulesList', 'ProjectUpdate', '$state', 'CreateSelect2' 'SchedulesList', 'ProjectUpdate', '$state', 'CreateSelect2', 'OrganizationList'
]; ];