From 39e67cd8457cb0884d5db14f5c9726c1af8bd20c Mon Sep 17 00:00:00 2001
From: jiazhong <jiazhong@ebay.com>
Date: Fri, 21 Nov 2014 14:54:42 +0800
Subject: [PATCH] set rowkey.column.length = 0 since dictionary default true

---
 webapp/app/js/controllers/cubeEdit.js                   | 12 ++++++------
 webapp/app/js/controllers/cubeSchema.js                 |  2 +-
 webapp/app/partials/cubeDesigner/advanced_settings.html |  4 +---
 webapp/app/partials/cubeDesigner/measures.html          |  2 +-
 4 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/webapp/app/js/controllers/cubeEdit.js b/webapp/app/js/controllers/cubeEdit.js
index 9a9905b..3eceece 100644
--- a/webapp/app/js/controllers/cubeEdit.js
+++ b/webapp/app/js/controllers/cubeEdit.js
@@ -256,7 +256,7 @@ KylinApp.controller('CubeEditCtrl', function ($scope, $q, $routeParams, $locatio
                     if(i == tmpRowKeyColumns.length) {
                         tmpRowKeyColumns.push({
                             "column": fk,
-                            "length": 30,
+                            "length": 0,
                             "dictionary": true,
                             "mandatory": false
                         });
@@ -272,7 +272,7 @@ KylinApp.controller('CubeEditCtrl', function ($scope, $q, $routeParams, $locatio
                 if(i == tmpRowKeyColumns.length) {
                     tmpRowKeyColumns.push({
                         "column": dimension.column,
-                        "length": 30,
+                        "length": 0,
                         "dictionary": true,
                         "mandatory": false
                     });
@@ -288,7 +288,7 @@ KylinApp.controller('CubeEditCtrl', function ($scope, $q, $routeParams, $locatio
                     if(i == tmpRowKeyColumns.length) {
                         tmpRowKeyColumns.push({
                             "column": hierarchy.column,
-                            "length": 30,
+                            "length": 0,
                             "dictionary": true,
                             "mandatory": false
                         });
@@ -454,7 +454,7 @@ KylinApp.controller('CubeEditCtrl', function ($scope, $q, $routeParams, $locatio
                     if(i == $scope.cubeMetaFrame.rowkey.rowkey_columns.length) {
                         $scope.cubeMetaFrame.rowkey.rowkey_columns.push({
                             "column": fk,
-                            "length": 30,
+                            "length": 0,
                             "dictionary": true,
                             "mandatory": false
                         });
@@ -471,7 +471,7 @@ KylinApp.controller('CubeEditCtrl', function ($scope, $q, $routeParams, $locatio
                 if(i == $scope.cubeMetaFrame.rowkey.rowkey_columns.length) {
                     $scope.cubeMetaFrame.rowkey.rowkey_columns.push({
                         "column": dimension.column,
-                        "length": 30,
+                        "length": 0,
                         "dictionary": true,
                         "mandatory": false
                     });
@@ -489,7 +489,7 @@ KylinApp.controller('CubeEditCtrl', function ($scope, $q, $routeParams, $locatio
                     if(i == $scope.cubeMetaFrame.rowkey.rowkey_columns.length) {
                         $scope.cubeMetaFrame.rowkey.rowkey_columns.push({
                             "column": hierarchy.column,
-                            "length": 30,
+                            "length": 0,
                             "dictionary": true,
                             "mandatory": false
                         });
diff --git a/webapp/app/js/controllers/cubeSchema.js b/webapp/app/js/controllers/cubeSchema.js
index e98f4da..d1c9e30 100644
--- a/webapp/app/js/controllers/cubeSchema.js
+++ b/webapp/app/js/controllers/cubeSchema.js
@@ -131,7 +131,7 @@ KylinApp.controller('CubeSchemaCtrl', function ($scope, QueryService, UserServic
         $scope.cubeMetaFrame.rowkey.rowkey_columns.push({
             "column": "",
             "length": 0,
-            "dictionary": null,
+            "dictionary": true,
             "mandatory": false
         });
     }
diff --git a/webapp/app/partials/cubeDesigner/advanced_settings.html b/webapp/app/partials/cubeDesigner/advanced_settings.html
index e3c259f..7b2eaef 100644
--- a/webapp/app/partials/cubeDesigner/advanced_settings.html
+++ b/webapp/app/partials/cubeDesigner/advanced_settings.html
@@ -109,9 +109,7 @@ <h4 style="margin-left:42px">Rowkeys</h4>
         </table>
 
         <button class="btn btn-sm btn-info" style="margin-left:42px"
-                ng-click="addNewRowkeyColumn()" ng-show="state.mode=='edit'">New Rowkey
-            Column<i
-                    class="fa fa-plus"></i></button>
+                ng-click="addNewRowkeyColumn()" ng-show="state.mode=='edit'">New Rowkey Column<i class="fa fa-plus"></i></button>
     </div>
 </div>
 
diff --git a/webapp/app/partials/cubeDesigner/measures.html b/webapp/app/partials/cubeDesigner/measures.html
index 2b9cd54..1f00189 100644
--- a/webapp/app/partials/cubeDesigner/measures.html
+++ b/webapp/app/partials/cubeDesigner/measures.html
@@ -184,7 +184,7 @@ <h4 class="box-title">Tips</h4>
     </div>
     <div class="box-footer">
         <button class="btn btn-sm btn-info" ng-disabled="edit_mes_form.$invalid"
-                ng-click="saveNewMeasure()" ng-show="state.mode=='edit'">Save</button>
+                ng-click="saveNewMeasure()" ng-show="state.mode=='edit'">OK</button>
         <button class="btn btn-link" ng-click="clearNewMeasure()">Cancel</button>
     </div>
 </div>