Return-Path: X-Original-To: apmail-kylin-commits-archive@minotaur.apache.org Delivered-To: apmail-kylin-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id B6F4D10C99 for ; Tue, 3 Mar 2015 10:28:38 +0000 (UTC) Received: (qmail 44819 invoked by uid 500); 3 Mar 2015 10:28:38 -0000 Delivered-To: apmail-kylin-commits-archive@kylin.apache.org Received: (qmail 44772 invoked by uid 500); 3 Mar 2015 10:28:38 -0000 Mailing-List: contact commits-help@kylin.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@kylin.incubator.apache.org Delivered-To: mailing list commits@kylin.incubator.apache.org Received: (qmail 44648 invoked by uid 99); 3 Mar 2015 10:28:38 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 03 Mar 2015 10:28:38 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED,T_RP_MATCHES_RCVD X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO mail.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with SMTP; Tue, 03 Mar 2015 10:28:36 +0000 Received: (qmail 43186 invoked by uid 99); 3 Mar 2015 10:28:15 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 03 Mar 2015 10:28:15 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 6E128E1080; Tue, 3 Mar 2015 10:28:15 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: liyang@apache.org To: commits@kylin.incubator.apache.org Date: Tue, 03 Mar 2015 10:28:40 -0000 Message-Id: <14e48255718e47dc885055c90ab29609@git.apache.org> In-Reply-To: <3e66ed5234cb42cfb80664f7d312fb4a@git.apache.org> References: <3e66ed5234cb42cfb80664f7d312fb4a@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [26/50] incubator-kylin git commit: fix ii cube save bug X-Virus-Checked: Checked by ClamAV on apache.org 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 Authored: Thu Feb 26 23:27:58 2015 +0800 Committer: jiazhong 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" /> {{ - (metaModel.model.partition_desc.partition_date_start|reverseToGMT0) }} + (metaModel.model.partition_desc.partition_date_start)|date:'yyyy-MM-dd HH:mm:ss' }} 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 @@