kylin-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From liy...@apache.org
Subject [26/50] incubator-kylin git commit: fix ii cube save bug
Date Tue, 03 Mar 2015 10:28:40 GMT
fix ii cube save bug


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

Branch: refs/heads/master
Commit: 6255da9e023cad827d2d029b1181805430f89fcc
Parents: 11ee3b3
Author: jiazhong <jiazhong@ebay.com>
Authored: Thu Feb 26 23:27:58 2015 +0800
Committer: jiazhong <jiazhong@ebay.com>
Committed: Thu Feb 26 23:27:58 2015 +0800

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


http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/6255da9e/webapp/app/js/controllers/cubeEdit.js
----------------------------------------------------------------------
diff --git a/webapp/app/js/controllers/cubeEdit.js b/webapp/app/js/controllers/cubeEdit.js
old mode 100644
new mode 100755
index 6518360..c2f0b5a
--- a/webapp/app/js/controllers/cubeEdit.js
+++ b/webapp/app/js/controllers/cubeEdit.js
@@ -108,17 +108,6 @@ KylinApp.controller('CubeEditCtrl', function ($scope, $q, $routeParams,
$locatio
         // generate column family
         generateColumnFamily();
 
-        // Clean up objects used in cube creation
-//        angular.forEach($scope.cubeMetaFrame.dimensions, function (dimension, index) {
-//            delete dimension.status;
-//
-//            for (var key in dimension) {
-//                if (dimension.hasOwnProperty(key) && !dimension[key]) {
-//                    delete dimension[key];
-//                }
-//            }
-//        });
-
 
         if ($scope.metaModel.model.partition_desc.partition_date_column&&($scope.metaModel.model.partition_desc.partition_date_start|$scope.metaModel.model.partition_desc.partition_date_start==0))
{
             var dateStart = new Date($scope.metaModel.model.partition_desc.partition_date_start);
@@ -132,6 +121,12 @@ KylinApp.controller('CubeEditCtrl', function ($scope, $q, $routeParams,
$locatio
             }
 
         }
+        //use cubedesc name as model name
+        if($scope.metaModel.model.name===""||angular.isUndefined($scope.metaModel.model.name)){
+            $scope.metaModel.model.name = $scope.cubeMetaFrame.name;
+        }
+
+        //set model ref for cubeDesc
         if($scope.cubeMetaFrame.model_name===""||angular.isUndefined($scope.cubeMetaFrame.model_name)){
             $scope.cubeMetaFrame.model_name = $scope.cubeMetaFrame.name;
         }

http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/6255da9e/webapp/app/js/controllers/cubeSchema.js
----------------------------------------------------------------------
diff --git a/webapp/app/js/controllers/cubeSchema.js b/webapp/app/js/controllers/cubeSchema.js
index b4c9dfc..e03808c 100644
--- a/webapp/app/js/controllers/cubeSchema.js
+++ b/webapp/app/js/controllers/cubeSchema.js
@@ -18,7 +18,7 @@
 
 'use strict';
 
-KylinApp.controller('CubeSchemaCtrl', function ($scope, QueryService, UserService, ProjectService,
AuthenticationService,$filter,ModelService,MetaModel) {
+KylinApp.controller('CubeSchemaCtrl', function ($scope, QueryService, UserService, ProjectService,
AuthenticationService,$filter,ModelService,MetaModel,CubeDescModel) {
 
     $scope.projects = [];
     $scope.newDimension = null;

http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/6255da9e/webapp/app/partials/cubeDesigner/incremental.html
----------------------------------------------------------------------
diff --git a/webapp/app/partials/cubeDesigner/incremental.html b/webapp/app/partials/cubeDesigner/incremental.html
old mode 100644
new mode 100755
index b3a6b1e..496cc36
--- a/webapp/app/partials/cubeDesigner/incremental.html
+++ b/webapp/app/partials/cubeDesigner/incremental.html
@@ -65,7 +65,7 @@
                            ng-model="metaModel.model.partition_desc.partition_date_start"
ng-if="state.mode=='edit'"
                            placeholder="Click to choose start date..." is-open="opened" />
                     <span ng-if="state.mode=='view'">{{
-                        (metaModel.model.partition_desc.partition_date_start|reverseToGMT0)
}}</span>
+                        (metaModel.model.partition_desc.partition_date_start)|date:'yyyy-MM-dd
HH:mm:ss' }}</span>
                 </div>
             </div>
         </div>

http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/6255da9e/webapp/app/partials/cubeDesigner/measures.html
----------------------------------------------------------------------
diff --git a/webapp/app/partials/cubeDesigner/measures.html b/webapp/app/partials/cubeDesigner/measures.html
old mode 100644
new mode 100755
index 7e19167..ef7c12f
--- a/webapp/app/partials/cubeDesigner/measures.html
+++ b/webapp/app/partials/cubeDesigner/measures.html
@@ -146,7 +146,7 @@
                                 <select class="form-control" chosen
                                     ng-if="newMeasure.function.parameter.type == 'column'"
                                     ng-model="newMeasure.function.parameter.value"
-                                    ng-options="columns.name as columns.name for columns
in getColumnsByTable(cubeMetaFrame.fact_table)" >
+                                    ng-options="columns.name as columns.name for columns
in getColumnsByTable(metaModel.model.fact_table)" >
                                     <option value="">-- Select a Fact Table Column
--</option>
                                 </select>
                             </div>


Mime
View raw message