Merge pull request #488 from lepdou/bugfix_publicnamespace

apollo-portal/src/main/resources/static/scripts/directive/namespace-panel-directive.js

@@ -222,7 +222,7 @@ function directive($window, toastr, AppUtil, EventManager, PermissionService, Na
                 }
 
                 function initLinkedNamespace(namespace) {
-                    if (!namespace.isPublic || !namespace.isLinkedNamespace) {
+                    if (!namespace.isPublic || !namespace.isLinkedNamespace || namespace.format != 'properties') {
                         return;
                     }
                     //load public namespace
@@ -237,12 +237,11 @@ function directive($window, toastr, AppUtil, EventManager, PermissionService, Na
                                 linkNamespaceItemKeys.push(key);
                             });
 
-
                             publicNamespace.viewItems = [];
                             publicNamespace.items.forEach(function (item) {
                                 var key = item.item.key;
 
-                                if (key){
+                                if (key) {
                                     publicNamespace.viewItems.push(item);
                                 }
 
@@ -250,7 +249,7 @@ function directive($window, toastr, AppUtil, EventManager, PermissionService, Na
 
                                 if (item.isModified || item.isDeleted) {
                                     publicNamespace.isModified = true;
-                                } else if (key){
+                                } else if (key) {
                                     publicNamespace.hasPublishedItem = true;
                                 }
                             });

apollo-portal/src/main/resources/static/views/component/namespace-panel-master-tab.html

@@ -373,7 +373,8 @@
             </div>
 
             <!--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="row">
                             <div class="padding-top-5 col-md-4">
@@ -567,6 +568,18 @@
                         <h5>无公共的配置</h5>
                     </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>
 
         <!--text view-->