You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kylin.apache.org by zh...@apache.org on 2016/01/13 13:32:32 UTC
kylin git commit: KYLIN-1310 do not add default auto merge time when
edit cube
Repository: kylin
Updated Branches:
refs/heads/2.0-rc b54a423fc -> 5047e6013
KYLIN-1310 do not add default auto merge time when edit cube
Project: http://git-wip-us.apache.org/repos/asf/kylin/repo
Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/5047e601
Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/5047e601
Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/5047e601
Branch: refs/heads/2.0-rc
Commit: 5047e601395b6b7af3538c09b2660cd0ea8fe8ec
Parents: b54a423
Author: jian <zh...@apache.org>
Authored: Wed Jan 13 20:32:15 2016 +0800
Committer: jian <zh...@apache.org>
Committed: Wed Jan 13 20:32:15 2016 +0800
----------------------------------------------------------------------
webapp/app/js/controllers/cubeAdvanceSetting.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/kylin/blob/5047e601/webapp/app/js/controllers/cubeAdvanceSetting.js
----------------------------------------------------------------------
diff --git a/webapp/app/js/controllers/cubeAdvanceSetting.js b/webapp/app/js/controllers/cubeAdvanceSetting.js
index fc02c6e..89712c9 100644
--- a/webapp/app/js/controllers/cubeAdvanceSetting.js
+++ b/webapp/app/js/controllers/cubeAdvanceSetting.js
@@ -32,7 +32,7 @@ KylinApp.controller('CubeAdvanceSettingCtrl', function ($scope, $modal,cubeConfi
if($scope.state.mode==="edit") {
$scope.metaModel = MetaModel;
if(!$scope.cubeMetaFrame.auto_merge_time_ranges){
- $scope.cubeMetaFrame.auto_merge_time_ranges = [604800000,2419200000];
+ $scope.cubeMetaFrame.auto_merge_time_ranges = [];
}
$scope._auto_merge_time_ranges = [];
angular.forEach($scope.cubeMetaFrame.auto_merge_time_ranges,function(item){