Merge branch 'orgs' of ssh://bitbucket.org/yackob03/quay into orgs
This commit is contained in:
commit
db13c38451
2 changed files with 2 additions and 3 deletions
|
@ -728,7 +728,7 @@ quayApp.directive('namespaceSelector', function () {
|
||||||
'namespace': '=namespace',
|
'namespace': '=namespace',
|
||||||
'requireCreate': '=requireCreate'
|
'requireCreate': '=requireCreate'
|
||||||
},
|
},
|
||||||
controller: function($scope, $element, $cookieStore) {
|
controller: function($scope, $element, $routeParams, $cookieStore) {
|
||||||
$scope.namespaces = {};
|
$scope.namespaces = {};
|
||||||
|
|
||||||
$scope.initialize = function(user) {
|
$scope.initialize = function(user) {
|
||||||
|
@ -740,7 +740,7 @@ quayApp.directive('namespaceSelector', function () {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
var initialNamespace = $cookieStore.get('quay.currentnamespace') || $scope.user.username;
|
var initialNamespace = $routeParams['namespace'] || $cookieStore.get('quay.currentnamespace') || $scope.user.username;
|
||||||
$scope.namespaces = namespaces;
|
$scope.namespaces = namespaces;
|
||||||
$scope.setNamespace($scope.namespaces[initialNamespace]);
|
$scope.setNamespace($scope.namespaces[initialNamespace]);
|
||||||
};
|
};
|
||||||
|
|
|
@ -566,7 +566,6 @@ ImageHistoryTree.prototype.update_ = function(source) {
|
||||||
|
|
||||||
// Translate the foreign object so the tags are under the ID.
|
// Translate the foreign object so the tags are under the ID.
|
||||||
fo.attr("transform", function(d, i) {
|
fo.attr("transform", function(d, i) {
|
||||||
bbox = this.getBBox()
|
|
||||||
return "translate(" + [-130, 0 ] + ")";
|
return "translate(" + [-130, 0 ] + ")";
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|
Reference in a new issue