[1/2] kylin git commit: KYLIN-1438, auto generate aggregation group when user create cube

[zhongjian]

Repository: kylin
Updated Branches:
  refs/heads/2.x-staging 44b020199 -> 1c4d3a158


KYLIN-1438, auto generate aggregation group when user create cube


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

Branch: refs/heads/2.x-staging
Commit: 2c602a0eac368720bc1108e1f515bda36b68e691
Parents: 44b0201
Author: janzhongi <jiazh...@ebay.com>
Authored: Tue Feb 23 19:13:26 2016 +0800
Committer: janzhongi <jiazh...@ebay.com>
Committed: Tue Feb 23 19:13:39 2016 +0800

----------------------------------------------------------------------
 webapp/app/js/controllers/cubeEdit.js | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/kylin/blob/2c602a0e/webapp/app/js/controllers/cubeEdit.js
----------------------------------------------------------------------
diff --git a/webapp/app/js/controllers/cubeEdit.js 
b/webapp/app/js/controllers/cubeEdit.js
index 578f6c8..7d8c299 100755
--- a/webapp/app/js/controllers/cubeEdit.js
+++ b/webapp/app/js/controllers/cubeEdit.js
@@ -30,7 +30,7 @@ KylinApp.controller('CubeEditCtrl', function ($scope, $q, 
$routeParams, $locatio
   var absUrl = $location.absUrl();
   $scope.cubeMode = absUrl.indexOf("/cubes/add") != -1 ? 'addNewCube' : 
absUrl.indexOf("/cubes/edit") != -1 ? 'editExistCube' : 'default';
 
-  if ($scope.cubeMode == "addNewCube" && ProjectModel.selectedProject==null) {
+  if ($scope.cubeMode == "addNewCube" &&ProjectModel.selectedProject==null) {
     SweetAlert.swal('Oops...', 'Please select your project first.', 'warning');
     $location.path("/models");
     return;
@@ -544,7 +544,7 @@ KylinApp.controller('CubeEditCtrl', function ($scope, $q, 
$routeParams, $locatio
     }
 
     if ($scope.cubeMode === "addNewCube") {
-      //only first time will after edit model will generate agg group auto
+      //only first time will will generate agg group auto
       if($scope.cubeMetaFrame.aggregation_groups.length){
         return;
       }
@@ -563,12 +563,14 @@ KylinApp.controller('CubeEditCtrl', function ($scope, $q, 
$routeParams, $locatio
       });
 
       $scope.cubeMetaFrame.aggregation_groups = [];
-      var increasedDataGroups = sliceGroupItemToGroups(newUniqAggregationItem);
-      for(var i in increasedDataGroups){
-       var newGroup =  CubeDescModel.createAggGroup();
-        newGroup.includes = increasedDataGroups[i];
-        $scope.cubeMetaFrame.aggregation_groups.push(newGroup);
+      var initJointGroups = sliceGroupItemToGroups(newUniqAggregationItem);
+      var newGroup =  CubeDescModel.createAggGroup();
+      newGroup.includes = newUniqAggregationItem;
+      for(var i=1;i<initJointGroups.length;i++){
+        newGroup.select_rule.joint_dims[i-1] = initJointGroups[i];
       }
+      $scope.cubeMetaFrame.aggregation_groups.push(newGroup);
+
     }
   }
 
@@ -636,7 +638,7 @@ KylinApp.controller('CubeEditCtrl', function ($scope, $q, 
$routeParams, $locatio
     var groups = [];
     var j = -1;
     for (var i = 0; i < groupItems.length; i++) {
-      if (i % 10 == 0) {
+      if (i % 8 == 0) {
         j++;
         groups[j] = [];
       }