Browse Source

AMBARI-5714. Views list not loading in Ambari Web.(xiwang)

Xi Wang 11 years ago
parent
commit
b427ffa269

+ 12 - 8
ambari-web/app/controllers/global/cluster_controller.js

@@ -412,14 +412,18 @@ App.ClusterController = Em.Controller.extend({
   },
   },
 
 
   loadViewInstancesSuccess: function (data) {
   loadViewInstancesSuccess: function (data) {
-    data.instances.forEach(function (instance) {
-      var view = Em.Object.create({
-        label: data.ViewInfo.label,
-        viewName: instance.ViewInstanceInfo.view_name,
-        instanceName: instance.ViewInstanceInfo.instance_name,
-        href: "/views/" + instance.ViewInstanceInfo.view_name + "/" + instance.ViewInstanceInfo.instance_name
-      });
-      this.get('ambariViews').push(view);
+    var self = this;
+    data.versions.forEach(function (version) {
+      version.instances.forEach(function (instance) {
+        var view = Em.Object.create({
+          label: data.ViewInfo.view_name,
+          viewName: instance.ViewInstanceInfo.view_name,
+          instanceName: instance.ViewInstanceInfo.instance_name,
+          version: version.ViewVersionInfo.version,
+          href: "/views/" + instance.ViewInstanceInfo.view_name + "/" + version.ViewVersionInfo.version + "/" + instance.ViewInstanceInfo.instance_name
+        });
+        self.get('ambariViews').push(view);
+      }, this);
     }, this);
     }, this);
   },
   },
 
 

+ 5 - 1
ambari-web/app/utils/ajax/ajax.js

@@ -2041,8 +2041,12 @@ var urls = {
     'real': '/views',
     'real': '/views',
     'mock':''
     'mock':''
   },
   },
+  /**
+   * Get all instances of {viewName} across versions
+   * @param {String} viewName
+   */
   'views.instances': {
   'views.instances': {
-    'real': '/views/{viewName}',
+    'real': '/views/{viewName}?fields=versions/instances',
     'mock':''
     'mock':''
   },
   },
   'host.host_component.flume.metrics': {
   'host.host_component.flume.metrics': {