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() {

4
static/js/graphing.js
View file

@ -26,7 +26,7 @@ if (!Function.prototype.bind) {
}
var DEPTH_HEIGHT = 100;
var DEPTH_WIDTH = 132;
var DEPTH_WIDTH = 140;
/**
* Based off of http://mbostock.github.io/d3/talk/20111018/tree.html by Mike Bostock (@mbostock)
@ -387,7 +387,7 @@ ImageHistoryTree.prototype.buildRoot_ = function() {
// Determine the maximum number of nodes at a particular level. This is used to size
// the width of the tree properly.
var maxChildCount = 0;
var maxChildCount = roots.length;
for (var i = 0; i < this.images_.length; ++i) {
var image = this.images_[i];
var imageNode = imageByDBID[image.dbid];

2
static/partials/org-admin.html
View file

@ -33,7 +33,7 @@
<div class="panel-title">Organization's e-mail address</div>
<div class="panel-content" style="padding-left: 20px; margin-top: 10px;">
<form class="form-change" id="changeEmailForm" name="changeEmailForm" ng-submit="changeEmail()" data-trigger="manual"
data-content="{{ changeEmailError }}" data-placement="right" ng-show="!updatingOrganization">
data-content="{{ changeEmailError }}" data-placement="bottom" ng-show="!updatingOrganization">
<img src="//www.gravatar.com/avatar/{{ organizationEmail | gravatar }}?s=24&amp;d=identicon">
<input type="email" class="form-control" ng-model="organizationEmail"
style="margin-left: 10px; margin-right: 10px; width: 400px; display: inline-block;" required>