Commit d83c6e23 authored by Jason Song's avatar Jason Song Committed by Jared Tan

fix #2768 that the namespace length is mis-calculated for private namespaces...

fix #2768 that the namespace length is mis-calculated for private namespaces and public namespaces which don't need to append prefix (#2784)
parent 232ebeb3
......@@ -62,10 +62,17 @@ namespace_module.controller("LinkNamespaceController",
if (!$scope.appBaseInfo) {
return '';
}
return $scope.appBaseInfo.namespacePrefix +
($scope.appNamespace.name ? $scope.appNamespace.name : '');
var appNamespaceName = $scope.appNamespace.name ? $scope.appNamespace.name : '';
if (shouldAppendNamespacePrefix()) {
return $scope.appBaseInfo.namespacePrefix + appNamespaceName;
}
return appNamespaceName;
};
function shouldAppendNamespacePrefix() {
return $scope.appNamespace.isPublic ? $scope.appendNamespacePrefix : false;
}
var selectedClusters = [];
$scope.collectSelectedClusters = function (data) {
selectedClusters = data;
......@@ -128,7 +135,7 @@ namespace_module.controller("LinkNamespaceController",
$scope.submitBtnDisabled = true;
//only append namespace prefix for public app namespace
var appendNamespacePrefix = $scope.appNamespace.isPublic ? $scope.appendNamespacePrefix : false;
var appendNamespacePrefix = shouldAppendNamespacePrefix();
NamespaceService.createAppNamespace($scope.appId, $scope.appNamespace, appendNamespacePrefix).then(
function (result) {
$scope.step = 2;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment