vbatts/quay
Archived
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge branch 'master' into orgs

Browse source 
Conflicts:
	endpoints/api.py
	static/partials/new-repo.html
This commit is contained in:
Joseph Schorr 2013-11-04 14:59:00 -05:00
commit 633f603f9d
4 changed files with 25 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

11
static/js/controllers.js
View file

@ -953,7 +953,7 @@ function V1Ctrl($scope, $location, UserService) {
}, true);
}
function NewRepoCtrl($scope, $location, $http, UserService, Restangular, PlanService) {
function NewRepoCtrl($scope, $location, $http, $timeout, UserService, Restangular, PlanService) {
$scope.$watch( function () { return UserService.currentUser(); }, function (currentUser) {
$scope.user = currentUser;
}, true);
@ -1079,6 +1079,8 @@ function NewRepoCtrl($scope, $location, $http, UserService, Restangular, PlanSer
};
$scope.createNewRepo = function() {
$('#repoName').popover('hide');
var uploader = $('#file-drop')[0];
if ($scope.repo.initialize && uploader.files.length < 1) {
$('#missingfileModal').modal();
@ -1107,9 +1109,12 @@ function NewRepoCtrl($scope, $location, $http, UserService, Restangular, PlanSer
// Otherwise, redirect to the repo page.
$location.path('/repository/' + created.namespace + '/' + created.name);
}, function() {
$('#cannotcreateModal').modal();
}, function(result) {
$scope.creating = false;
$scope.createError = result.data;
$timeout(function() {
$('#repoName').popover('show');
});
});
};