ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From xiw...@apache.org
Subject [2/2] git commit: AMBARI-5769. Views: selection should use instance name, not view name.(xiwang)
Date Fri, 16 May 2014 21:26:54 GMT
AMBARI-5769. Views: selection should use instance name, not view name.(xiwang)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/61809500
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/61809500
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/61809500

Branch: refs/heads/trunk
Commit: 618095000d85f3e5bb765065840e5b8f9179acda
Parents: cc20626
Author: Xi Wang <xiwang@apache.org>
Authored: Wed May 14 17:48:59 2014 -0700
Committer: Xi Wang <xiwang@apache.org>
Committed: Fri May 16 14:25:49 2014 -0700

----------------------------------------------------------------------
 ambari-web/app/controllers/global/cluster_controller.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/61809500/ambari-web/app/controllers/global/cluster_controller.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/controllers/global/cluster_controller.js b/ambari-web/app/controllers/global/cluster_controller.js
index ecb4304..8e0c148 100644
--- a/ambari-web/app/controllers/global/cluster_controller.js
+++ b/ambari-web/app/controllers/global/cluster_controller.js
@@ -416,7 +416,7 @@ App.ClusterController = Em.Controller.extend({
     data.versions.forEach(function (version) {
       version.instances.forEach(function (instance) {
         var view = Em.Object.create({
-          label: data.ViewInfo.view_name,
+          label: instance.ViewInstanceInfo.label || instance.ViewInstanceInfo.instance_name,
           viewName: instance.ViewInstanceInfo.view_name,
           instanceName: instance.ViewInstanceInfo.instance_name,
           version: version.ViewVersionInfo.version,


Mime
View raw message