From bea609032e5349a8d280f3119855c8202f7f92ed Mon Sep 17 00:00:00 2001
From: jiazhong <jiazhong@ebay.com>
Date: Fri, 12 Dec 2014 15:04:31 +0800
Subject: [PATCH] fix duplicate rowkey column bug

---
 .../main/java/com/kylinolap/metadata/model/cube/CubeDesc.java  |  2 +-
 webapp/app/js/controllers/cubeEdit.js                          |  4 ++--
 webapp/app/partials/jobs/jobs.html                             | 10 +++++-----
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/metadata/src/main/java/com/kylinolap/metadata/model/cube/CubeDesc.java b/metadata/src/main/java/com/kylinolap/metadata/model/cube/CubeDesc.java
index db9f177..f6c638a 100644
--- a/metadata/src/main/java/com/kylinolap/metadata/model/cube/CubeDesc.java
+++ b/metadata/src/main/java/com/kylinolap/metadata/model/cube/CubeDesc.java
@@ -489,7 +489,7 @@ public void init(KylinConfig config, Map<String, TableDesc> tables) {
         // check all dimension columns are presented on rowkey
         List<TblColRef> dimCols = listDimensionColumnsExcludingDerived();
         if (rowkey.getRowKeyColumns().length != dimCols.size()) {
-            addError("RowKey columns count (" + rowkey.getRowKeyColumns().length + ") does not equal to dimension columns count (" + dimCols.size() + "). ");
+            addError("RowKey columns count (" + rowkey.getRowKeyColumns().length + ") does not match dimension columns count (" + dimCols.size() + "). ");
         }
     }
 
diff --git a/webapp/app/js/controllers/cubeEdit.js b/webapp/app/js/controllers/cubeEdit.js
index 56afdaf..02c1acc 100644
--- a/webapp/app/js/controllers/cubeEdit.js
+++ b/webapp/app/js/controllers/cubeEdit.js
@@ -292,7 +292,7 @@ KylinApp.controller('CubeEditCtrl', function ($scope, $q, $routeParams, $locatio
             }
             else if (dimension.column) {
                 for (var i = 0; i < tmpRowKeyColumns.length; i++) {
-                    if(tmpRowKeyColumns.column == dimension.column)
+                    if(tmpRowKeyColumns[i].column == dimension.column)
                         break;
                 }
                 if(i == tmpRowKeyColumns.length) {
@@ -308,7 +308,7 @@ KylinApp.controller('CubeEditCtrl', function ($scope, $q, $routeParams, $locatio
             if (dimension.hierarchy && dimension.hierarchy.length > 0) {
                 angular.forEach(dimension.hierarchy, function (hierarchy, index) {
                     for (var i = 0; i < tmpRowKeyColumns.length; i++) {
-                        if(tmpRowKeyColumns.column == hierarchy.column)
+                        if(tmpRowKeyColumns[i].column == hierarchy.column)
                             break;
                     }
                     if(i == tmpRowKeyColumns.length) {
diff --git a/webapp/app/partials/jobs/jobs.html b/webapp/app/partials/jobs/jobs.html
index 4ed91f0..cc20ff6 100644
--- a/webapp/app/partials/jobs/jobs.html
+++ b/webapp/app/partials/jobs/jobs.html
@@ -89,27 +89,27 @@
                     <td>{{ job.related_cube}}</td>
                     <td>
                         <div ng-switch on="job.job_status">
-                            <div ng-switch-when="ERROR">
+                            <div ng-switch-when="ERROR" tooltip="ERROR">
                                 <progressbar class="progress-striped" value="job.progress" type="danger">
                                     {{job.job_status}}
                                 </progressbar>
                             </div>
-                            <div ng-switch-when="FINISHED">
+                            <div ng-switch-when="FINISHED" tooltip="FINISHED">
                                 <progressbar class="progress-striped" value="job.progress" type="success">
                                     {{job.progress}}%
                                 </progressbar>
                             </div>
-                            <div ng-switch-when="PENDING">
+                            <div ng-switch-when="PENDING" tooltip="PENDING">
                                 <progressbar class="progress-striped active" value="job.progress"
                                              type="pending">{{job.job_status}}
                                 </progressbar>
                             </div>
-                            <div ng-switch-when="RUNNING">
+                            <div ng-switch-when="RUNNING" tooltip="RUNNING">
                                 <progressbar class="progress-striped active" value="job.progress"
                                              type="info">{{job.progress | number:2}}%
                                 </progressbar>
                             </div>
-                            <div ng-switch-when="DISCARDED">
+                            <div ng-switch-when="DISCARDED" tooltip="DISCARDED">
                                 <progressbar class="progress-striped" value="job.progress" type="inverse">
                                     {{job.progress | number:2}}%
                                 </progressbar>