Commit c8ed6bd6 by lepdou

UI handle public namespace not exist situation

parent 7e4f6bcc
...@@ -222,7 +222,7 @@ function directive($window, toastr, AppUtil, EventManager, PermissionService, Na ...@@ -222,7 +222,7 @@ function directive($window, toastr, AppUtil, EventManager, PermissionService, Na
} }
function initLinkedNamespace(namespace) { function initLinkedNamespace(namespace) {
if (!namespace.isPublic || !namespace.isLinkedNamespace) { if (!namespace.isPublic || !namespace.isLinkedNamespace || namespace.format != 'properties') {
return; return;
} }
//load public namespace //load public namespace
...@@ -237,12 +237,11 @@ function directive($window, toastr, AppUtil, EventManager, PermissionService, Na ...@@ -237,12 +237,11 @@ function directive($window, toastr, AppUtil, EventManager, PermissionService, Na
linkNamespaceItemKeys.push(key); linkNamespaceItemKeys.push(key);
}); });
publicNamespace.viewItems = []; publicNamespace.viewItems = [];
publicNamespace.items.forEach(function (item) { publicNamespace.items.forEach(function (item) {
var key = item.item.key; var key = item.item.key;
if (key){ if (key) {
publicNamespace.viewItems.push(item); publicNamespace.viewItems.push(item);
} }
...@@ -250,7 +249,7 @@ function directive($window, toastr, AppUtil, EventManager, PermissionService, Na ...@@ -250,7 +249,7 @@ function directive($window, toastr, AppUtil, EventManager, PermissionService, Na
if (item.isModified || item.isDeleted) { if (item.isModified || item.isDeleted) {
publicNamespace.isModified = true; publicNamespace.isModified = true;
} else if (key){ } else if (key) {
publicNamespace.hasPublishedItem = true; publicNamespace.hasPublishedItem = true;
} }
}); });
......
...@@ -373,7 +373,8 @@ ...@@ -373,7 +373,8 @@
</div> </div>
<!--link namespace's public namespace--> <!--link namespace's public namespace-->
<div class="panel panel-default" ng-if="namespace.isLinkedNamespace"> <div ng-if="namespace.isLinkedNamespace">
<div class="panel panel-default" ng-if="namespace.publicNamespace">
<div class="panel-heading"> <div class="panel-heading">
<div class="row"> <div class="row">
<div class="padding-top-5 col-md-4"> <div class="padding-top-5 col-md-4">
...@@ -567,6 +568,18 @@ ...@@ -567,6 +568,18 @@
<h5>无公共的配置</h5> <h5>无公共的配置</h5>
</div> </div>
</div> </div>
<div class="panel panel-default" ng-if="!namespace.publicNamespace">
<div class="panel-heading">
公共的配置
</div>
<div class="panel-body text-center">
当前公共namespace的所有者
<a href="/config.html?#/appid={{namespace.parentAppId}}" target="_blank">{{namespace.parentAppId}}</a>
没有关联此namespace,请联系{{namespace.parentAppId}}的所有者在{{namespace.parentAppId}}项目里关联此namespace
</div>
</div>
</div>
</div> </div>
<!--text view--> <!--text view-->
......
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