You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kylin.apache.org by li...@apache.org on 2015/03/14 01:01:59 UTC
[14/50] [abbrv] incubator-kylin git commit: fix KYLIN-524 & add tip
for partition column field
fix KYLIN-524 & add tip for partition column field
Project: http://git-wip-us.apache.org/repos/asf/incubator-kylin/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-kylin/commit/c6adb698
Tree: http://git-wip-us.apache.org/repos/asf/incubator-kylin/tree/c6adb698
Diff: http://git-wip-us.apache.org/repos/asf/incubator-kylin/diff/c6adb698
Branch: refs/heads/staging
Commit: c6adb698d6b38d19fc156bb8f0ecff1cf90b88ec
Parents: cfbd6ae
Author: jiazhong <ji...@ebay.com>
Authored: Mon Mar 9 16:26:58 2015 +0800
Committer: jiazhong <ji...@ebay.com>
Committed: Mon Mar 9 16:26:58 2015 +0800
----------------------------------------------------------------------
webapp/app/js/controllers/cubeModel.js | 35 ++++++++++++++++----
webapp/app/js/model/metaModel.js | 2 +-
.../app/partials/cubeDesigner/dimensions.html | 1 -
.../app/partials/cubeDesigner/incremental.html | 9 ++---
4 files changed, 34 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/c6adb698/webapp/app/js/controllers/cubeModel.js
----------------------------------------------------------------------
diff --git a/webapp/app/js/controllers/cubeModel.js b/webapp/app/js/controllers/cubeModel.js
index 45425c8..1e5fab0 100644
--- a/webapp/app/js/controllers/cubeModel.js
+++ b/webapp/app/js/controllers/cubeModel.js
@@ -18,11 +18,8 @@
'use strict';
-KylinApp.controller('CubeModelCtrl', function ($scope, $modal,cubeConfig,ModelService,MetaModel) {
+KylinApp.controller('CubeModelCtrl', function ($scope, $modal,cubeConfig,ModelService,MetaModel,SweetAlert) {
-// if($scope.state.mode==="edit") {
-// $scope.metaModel = MetaModel;
-// }
$scope.cubeConfig = cubeConfig;
var DataModel = function () {
return {
@@ -113,9 +110,33 @@ KylinApp.controller('CubeModelCtrl', function ($scope, $modal,cubeConfig,ModelSe
$scope.resetParams();
};
- $scope.removeLookup = function (lookup) {
- lookupList.splice(lookupList.indexOf(lookup), 1);
- };
+ $scope.removeLookup = function (lookup) {
+ var dimExist = _.some($scope.cubeMetaFrame.dimensions,function(item,index){
+ return item.table===lookup.table;
+ });
+ if(dimExist) {
+ SweetAlert.swal({
+ title: '',
+ text: "Once it's removed, all relative dimensions will be removed. Are you sure to remove the lookup table?",
+ type: '',
+ showCancelButton: true,
+ confirmButtonColor: '#DD6B55',
+ confirmButtonText: "Yes",
+ closeOnConfirm: true
+ }, function (isConfirm) {
+ if (isConfirm) {
+ for (var i = $scope.cubeMetaFrame.dimensions.length - 1; i >= 0; i--) {
+ if ($scope.cubeMetaFrame.dimensions[i].table === lookup.table) {
+ $scope.cubeMetaFrame.dimensions.splice(i, 1);
+ }
+ }
+ lookupList.splice(lookupList.indexOf(lookup), 1);
+ }
+ });
+ }else{
+ lookupList.splice(lookupList.indexOf(lookup), 1);
+ }
+ };
$scope.resetParams = function () {
$scope.lookupState.editing = false;
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/c6adb698/webapp/app/js/model/metaModel.js
----------------------------------------------------------------------
diff --git a/webapp/app/js/model/metaModel.js b/webapp/app/js/model/metaModel.js
index 9fd5ed6..a21c83c 100644
--- a/webapp/app/js/model/metaModel.js
+++ b/webapp/app/js/model/metaModel.js
@@ -70,7 +70,7 @@ KylinApp.service('MetaModel',function(){
fact_table: '',
lookups: [],
filter_condition:'',
- capacity:'',
+ capacity:'MEDIUM',
"partition_desc" : {
"partition_date_column" : '',
"partition_date_start" : 0,
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/c6adb698/webapp/app/partials/cubeDesigner/dimensions.html
----------------------------------------------------------------------
diff --git a/webapp/app/partials/cubeDesigner/dimensions.html b/webapp/app/partials/cubeDesigner/dimensions.html
index 21ef2f5..acb351f 100644
--- a/webapp/app/partials/cubeDesigner/dimensions.html
+++ b/webapp/app/partials/cubeDesigner/dimensions.html
@@ -125,7 +125,6 @@
</div>
</div>
-
<!-- Edit Dimension Form -->
<script type="text/ng-template" id="addEditDimension.html">
<div class="modal-header">
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/c6adb698/webapp/app/partials/cubeDesigner/incremental.html
----------------------------------------------------------------------
diff --git a/webapp/app/partials/cubeDesigner/incremental.html b/webapp/app/partials/cubeDesigner/incremental.html
index 6f40371..6b21dc3 100755
--- a/webapp/app/partials/cubeDesigner/incremental.html
+++ b/webapp/app/partials/cubeDesigner/incremental.html
@@ -46,9 +46,11 @@
ng-required="metaModel.model.partition_desc.partition_date_start"
ng-model="metaModel.model.partition_desc.partition_date_column"
ng-if="state.mode=='edit'"
+ data-placement=""
ng-options="metaModel.model.fact_table+'.'+columns.name as metaModel.model.fact_table+'.'+columns.name for columns in getPartitonColumns(metaModel.model.fact_table)" >
- <option value=""></option>
+ <option value="">--Select Partition Column--</option>
</select>
+ <p class="text-red" ng-if="state.mode=='edit'">(Partition column will select 'date' type column from fact table)</p>
<span ng-if="state.mode=='view'">
{{!!(metaModel.model.partition_desc.partition_date_column)?metaModel.model.partition_desc.partition_date_column: ''}}</span>
</div>
@@ -80,9 +82,8 @@
<div class="row">
<div class="col-xs-12">
<ol class="text-info">
- <li>Leave as default if this cube always need full build</li>
- <li>Please indicate partition column of Fact Table in Hive</li>
- <li>Please indicate start date to just pull certain data from source</li>
+ <li>Not required,leave as default if this cube always need full build</li>
+ <li>If column selected,please indicate start date to just pull certain data from source</li>
</ol>
</div>
</div>