Merge master into bitbucket
This commit is contained in:
commit
b96e35b28c
44 changed files with 695 additions and 110 deletions
|
@ -56,6 +56,16 @@ function($rootScope, $interval, UserService, ApiService, StringBuilderService, P
|
|||
'<br><br>Please upgrade your plan to avoid disruptions in service.',
|
||||
'page': function(metadata) {
|
||||
var organization = UserService.getOrganization(metadata['namespace']);
|
||||
|
||||
// TODO(jschorr): Remove once the new layout is in prod.
|
||||
if (Config.isNewLayout()) {
|
||||
if (organization) {
|
||||
return '/organization/' + metadata['namespace'] + '?tab=billing';
|
||||
} else {
|
||||
return '/user/' + metadata['namespace'] + '?tab=billing';
|
||||
}
|
||||
}
|
||||
|
||||
if (organization) {
|
||||
return '/organization/' + metadata['namespace'] + '/admin';
|
||||
} else {
|
||||
|
|
Reference in a new issue