浏览代码

AMBARI-7243. Admin View: no way to link to instance if you create w/o a label via API. (akovalenko)

Aleksandr Kovalenko 10 年之前
父节点
当前提交
3f9d5a53f3

+ 3 - 3
ambari-admin/src/main/resources/ui/admin-web/app/scripts/services/View.js

@@ -59,9 +59,9 @@ angular.module('ambariAdminConsole')
     angular.forEach(item.versions, function(version) {
       versions[version.ViewVersionInfo.version] = version.instances.length;
       
-      angular.forEach(version.instances, function(isntance) {
-        isntance.label = version.ViewVersionInfo.label;
-      })
+      angular.forEach(version.instances, function(instance) {
+        instance.label = instance.ViewInstanceInfo.label || version.ViewVersionInfo.label || instance.ViewInstanceInfo.view_name;
+      });
 
       self.instances = self.instances.concat(version.instances);
     });

+ 1 - 1
ambari-admin/src/main/resources/ui/admin-web/app/views/ambariViews/listTable.html

@@ -54,7 +54,7 @@
           <tr ng-repeat="instance in view.instances">
             <td class="col-sm-3"></td>
             <td class="col-sm-3">
-              <a href="#/views/{{view.view_name}}/versions/{{instance.ViewInstanceInfo.version}}/instances/{{instance.ViewInstanceInfo.instance_name}}/edit" class="instance-link">{{instance.ViewInstanceInfo.label}}</a>
+              <a href="#/views/{{view.view_name}}/versions/{{instance.ViewInstanceInfo.version}}/instances/{{instance.ViewInstanceInfo.instance_name}}/edit" class="instance-link">{{instance.label}}</a>
             </td>
             <td class="col-sm-1">{{instance.ViewInstanceInfo.version}}</td>
             <td class="col-sm-5 " ><div class="description-column" tooltip="{{instance.ViewInstanceInfo.description}}">{{instance.ViewInstanceInfo.description || 'No description'}}</div>