From 9e1f2ae5bf7a61c6536fd588d0f8addd13f0bdc6 Mon Sep 17 00:00:00 2001
From: chenzhx <346839943@qq.com>
Date: Thu, 6 Apr 2017 14:52:05 +0800
Subject: [PATCH] KYLIN 2534 column family select mistake

---
 webapp/app/js/controllers/cubeAdvanceSetting.js | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/webapp/app/js/controllers/cubeAdvanceSetting.js b/webapp/app/js/controllers/cubeAdvanceSetting.js
index 5e7de336a..d3e2922a2 100644
--- a/webapp/app/js/controllers/cubeAdvanceSetting.js
+++ b/webapp/app/js/controllers/cubeAdvanceSetting.js
@@ -339,18 +339,19 @@ KylinApp.controller('CubeAdvanceSettingCtrl', function ($scope, $modal,cubeConfi
     var allMeasureNames = $scope.getAllMeasureNames();
     var tmpColumnFamily = $scope.cubeMetaFrame.hbase_mapping.column_family;
 
-    angular.forEach($scope.cubeMetaFrame.hbase_mapping.column_family, function (colFamily,index1) {
-      angular.forEach(colFamily.columns[0].measure_refs, function (measureName, index2) {
-        var allIndex = allMeasureNames.indexOf(measureName);
+    for(var j=0;j<$scope.cubeMetaFrame.hbase_mapping.column_family.length; j++) {
+      for (var i=0;i<$scope.cubeMetaFrame.hbase_mapping.column_family[j].columns[0].measure_refs.length; i++){
+        var allIndex = allMeasureNames.indexOf($scope.cubeMetaFrame.hbase_mapping.column_family[j].columns[0].measure_refs[i]);
         if (allIndex == -1) {
-          tmpColumnFamily[index1].columns[0].measure_refs.splice(index2, 1);
+          tmpColumnFamily[j].columns[0].measure_refs.splice(i, 1);
+          i--
         }
-
-        if (tmpColumnFamily[index1].columns[0].measure_refs == 0) {
-          tmpColumnFamily.splice(index1, 1);
-        }
-      });
-    });
+      }
+      if (tmpColumnFamily[j].columns[0].measure_refs.length == 0) {
+        tmpColumnFamily.splice(j, 1);
+        j--
+      }
+    }
 
     $scope.cubeMetaFrame.hbase_mapping.column_family = tmpColumnFamily;
   };
-- 
2.11.0.windows.1