Skip to content

Commit

Permalink
Merge pull request #899 from ZitaNemeckova/repo_api_fix
Browse files Browse the repository at this point in the history
Use manager_resource only to create Repository
(cherry picked from commit a337974)

https://bugzilla.redhat.com/show_bug.cgi?id=1438829
  • Loading branch information
mzazrivec authored and simaishi committed Apr 4, 2017
1 parent 5364f9d commit 3f19253
Showing 1 changed file with 11 additions and 11 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ ManageIQ.angular.app.controller('repositoryFormController', ['$scope', 'reposito
name: '',
description: '',
scm_type: 'git',
manager_resource: {},
scm_url: '',
authentication_id: null,
scm_branch: '',
Expand All @@ -17,10 +16,6 @@ ManageIQ.angular.app.controller('repositoryFormController', ['$scope', 'reposito
scm_update_on_launch: false,
};

API.get('/api/providers?collection_class=ManageIQ::Providers::EmbeddedAutomationManager')
.then(getManagerResource)
.catch(miqService.handleFailure);

vm.model = 'repositoryModel';

ManageIQ.angular.scope = vm;
Expand All @@ -37,9 +32,9 @@ ManageIQ.angular.app.controller('repositoryFormController', ['$scope', 'reposito
.then(getRepositoryFormData)
.catch(miqService.handleFailure);
} else {
vm.afterGet = true;
vm.modelCopy = angular.copy( vm.repositoryModel );
miqService.sparkleOff();
API.get('/api/providers?collection_class=ManageIQ::Providers::EmbeddedAutomationManager')
.then(getManagerResource)
.catch(miqService.handleFailure);
}
};

Expand Down Expand Up @@ -70,12 +65,16 @@ ManageIQ.angular.app.controller('repositoryFormController', ['$scope', 'reposito
.catch(miqService.handleFailure);
};

var getRepositoryFormData = function(response) {
var data = response;
Object.assign(vm.repositoryModel, data);
function setForm() {
vm.modelCopy = angular.copy( vm.repositoryModel );
vm.afterGet = true;
miqService.sparkleOff();
}

var getRepositoryFormData = function(response) {
var data = response;
Object.assign(vm.repositoryModel, data);
setForm();
};

var getBack = function(response) {
Expand Down Expand Up @@ -117,6 +116,7 @@ ManageIQ.angular.app.controller('repositoryFormController', ['$scope', 'reposito
} else {
vm.repositoryModel.manager_resource = {'href': response.resources[0].href};
}
setForm();
};
init();
}]);
Expand Down

0 comments on commit 3f19253

Please sign in to comment.