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 6760017CB2 for ; Sat, 14 Mar 2015 00:01:39 +0000 (UTC) Received: (qmail 85092 invoked by uid 500); 14 Mar 2015 00:01:39 -0000 Delivered-To: apmail-kylin-commits-archive@kylin.apache.org Received: (qmail 84976 invoked by uid 500); 14 Mar 2015 00:01:39 -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 84621 invoked by uid 99); 14 Mar 2015 00:01:38 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 14 Mar 2015 00:01: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; Sat, 14 Mar 2015 00:01:37 +0000 Received: (qmail 82441 invoked by uid 99); 14 Mar 2015 00:01:14 -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; Sat, 14 Mar 2015 00:01:14 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id B02A3E1906; Sat, 14 Mar 2015 00:01:14 +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: Sat, 14 Mar 2015 00:01:47 -0000 Message-Id: In-Reply-To: <4978577a74294e6384beb83847b95191@git.apache.org> References: <4978577a74294e6384beb83847b95191@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [34/50] incubator-kylin git commit: fix KYLIN-517 X-Virus-Checked: Checked by ClamAV on apache.org fix KYLIN-517 Project: http://git-wip-us.apache.org/repos/asf/incubator-kylin/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-kylin/commit/ec0fb0f8 Tree: http://git-wip-us.apache.org/repos/asf/incubator-kylin/tree/ec0fb0f8 Diff: http://git-wip-us.apache.org/repos/asf/incubator-kylin/diff/ec0fb0f8 Branch: refs/heads/streaming Commit: ec0fb0f80e424cfa6983960f861b6c3e69c06c53 Parents: 8dcc9a6 Author: jiazhong Authored: Tue Mar 10 14:43:52 2015 +0800 Committer: jiazhong Committed: Tue Mar 10 14:43:52 2015 +0800 ---------------------------------------------------------------------- webapp/app/js/controllers/cubeDimensions.js | 1 - webapp/app/js/controllers/cubeModel.js | 21 +++++++++++--------- webapp/app/less/component.less | 14 +++++-------- .../app/partials/cubeDesigner/data_model.html | 12 +++++------ .../app/partials/cubeDesigner/dimensions.html | 2 +- 5 files changed, 23 insertions(+), 27 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/ec0fb0f8/webapp/app/js/controllers/cubeDimensions.js ---------------------------------------------------------------------- diff --git a/webapp/app/js/controllers/cubeDimensions.js b/webapp/app/js/controllers/cubeDimensions.js index e57e05b..f323d1f 100644 --- a/webapp/app/js/controllers/cubeDimensions.js +++ b/webapp/app/js/controllers/cubeDimensions.js @@ -395,7 +395,6 @@ KylinApp.controller('CubeDimensionsCtrl', function ($scope, $modal,MetaModel) { if ($scope.state.mode == 'edit') { $scope.$on('$destroy', function () { // $scope.dimensionsAdapter(); - // Emit dimensions edit event in order to re-generate row key. $scope.$emit('DimensionsEdited'); }); http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/ec0fb0f8/webapp/app/js/controllers/cubeModel.js ---------------------------------------------------------------------- diff --git a/webapp/app/js/controllers/cubeModel.js b/webapp/app/js/controllers/cubeModel.js index 1e5fab0..2874742 100644 --- a/webapp/app/js/controllers/cubeModel.js +++ b/webapp/app/js/controllers/cubeModel.js @@ -18,7 +18,7 @@ 'use strict'; -KylinApp.controller('CubeModelCtrl', function ($scope, $modal,cubeConfig,ModelService,MetaModel,SweetAlert) { +KylinApp.controller('CubeModelCtrl', function ($scope, $modal,cubeConfig,ModelService,MetaModel,SweetAlert,$log) { $scope.cubeConfig = cubeConfig; var DataModel = function () { @@ -138,17 +138,20 @@ KylinApp.controller('CubeModelCtrl', function ($scope, $modal,cubeConfig,ModelSe } }; + + $scope.addNewJoin = function(){ + $scope.newLookup.join.primary_key.push("null"); + $scope.newLookup.join.foreign_key.push("null"); + }; + + $scope.removeJoin = function($index){ + $scope.newLookup.join.primary_key.splice($index,1); + $scope.newLookup.join.foreign_key.splice($index,1); + }; + $scope.resetParams = function () { $scope.lookupState.editing = false; $scope.lookupState.editingIndex = -1; - $scope.newLookup = Lookup(); }; - - // This is for legacy compatibility, assign 'fact_table' property. TODO new cube schema change. -// $scope.$on('$destroy', function () { -// if (!$scope.cubeMetaFrame.fact_table) { -// $scope.cubeMetaFrame.fact_table = $scope.cubeMetaFrame.model.fact_table; -// } -// }); }); http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/ec0fb0f8/webapp/app/less/component.less ---------------------------------------------------------------------- diff --git a/webapp/app/less/component.less b/webapp/app/less/component.less index c7bd1cf..4caf964 100644 --- a/webapp/app/less/component.less +++ b/webapp/app/less/component.less @@ -828,18 +828,14 @@ span.input-icon { background-color: #C6C41D; } -//style fix chosen bug -#derived .localytics-chosen,#derived .chosen-container{ - width:85% !important; -} -#hierarchy .localytics-chosen,#hierarchy .chosen-container { - width: 100% !important; -} - .sort-item { padding: 2px; width: 50px; height: 20px; cursor: move; -// border-left: 1px solid #333; +} + +.cube-dimension .dl-horizontal{ + margin-top: 0px !important; + margin-bottom: 0px !important; } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/ec0fb0f8/webapp/app/partials/cubeDesigner/data_model.html ---------------------------------------------------------------------- diff --git a/webapp/app/partials/cubeDesigner/data_model.html b/webapp/app/partials/cubeDesigner/data_model.html index bdfda69..4aeb1da 100644 --- a/webapp/app/partials/cubeDesigner/data_model.html +++ b/webapp/app/partials/cubeDesigner/data_model.html @@ -78,7 +78,7 @@
    -
  • +
  • {{lookup.table + '.' + pk}} = {{metaModel.model.fact_table + '.' + lookup.join.foreign_key[$index]}}
@@ -146,11 +146,9 @@ ng-options="columns.name as columns.name for columns in getColumnsByTable(metaModel.model.fact_table)" > -
@@ -163,7 +161,7 @@
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/ec0fb0f8/webapp/app/partials/cubeDesigner/dimensions.html ---------------------------------------------------------------------- diff --git a/webapp/app/partials/cubeDesigner/dimensions.html b/webapp/app/partials/cubeDesigner/dimensions.html index acb351f..dbbc46d 100644 --- a/webapp/app/partials/cubeDesigner/dimensions.html +++ b/webapp/app/partials/cubeDesigner/dimensions.html @@ -58,7 +58,7 @@ Actions - +