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

Merge remote-tracking branch 'origin/master' into umask

Browse source 
Conflicts:
	initdb.py
	test/data/test.db
This commit is contained in:
yackob03 2014-01-22 11:53:20 -05:00
commit 459f30c123
46 changed files with 78463 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

8
static/js/controllers.js
View file

@ -1443,7 +1443,7 @@ function OrgViewCtrl($rootScope, $scope, ApiService, $routeParams) {
loadOrganization();
}
function OrgAdminCtrl($rootScope, $scope, Restangular, $routeParams, UserService, PlanService, ApiService) {
function OrgAdminCtrl($rootScope, $scope, $timeout, Restangular, $routeParams, UserService, PlanService, ApiService) {
var orgname = $routeParams.orgname;
// Load the list of plans.
@ -1476,6 +1476,10 @@ function OrgAdminCtrl($rootScope, $scope, Restangular, $routeParams, UserService
$scope.hasPaidPlan = plan && plan.price > 0;
};
$scope.$watch('organizationEmail', function(e) {
$('#changeEmailForm').popover('hide');
});
$scope.changeEmail = function() {
$scope.changingOrganization = true;
var params = {
@ -1490,7 +1494,7 @@ function OrgAdminCtrl($rootScope, $scope, Restangular, $routeParams, UserService
$scope.changingOrganization = false;
$scope.changeEmailForm.$setPristine();
$scope.organization = org;
}, function(resp) {
}, function(result) {
$scope.changingOrganization = false;
$scope.changeEmailError = result.data.message;
$timeout(function() {