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/02/24 10:08:47 UTC
kylin git commit: KYLIN-1443 sort auto merge time range increasingly
by default
Repository: kylin
Updated Branches:
refs/heads/1.x-staging e80b2008b -> 836b936bc
KYLIN-1443 sort auto merge time range increasingly by default
Project: http://git-wip-us.apache.org/repos/asf/kylin/repo
Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/836b936b
Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/836b936b
Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/836b936b
Branch: refs/heads/1.x-staging
Commit: 836b936bceb5964b42ce3eb25b7f243deef2e344
Parents: e80b200
Author: janzhongi <ji...@ebay.com>
Authored: Wed Feb 24 17:08:31 2016 +0800
Committer: janzhongi <ji...@ebay.com>
Committed: Wed Feb 24 17:08:31 2016 +0800
----------------------------------------------------------------------
webapp/app/js/controllers/cubeAdvanceSetting.js | 7 +++++++
webapp/app/partials/cubeDesigner/advanced_settings.html | 2 +-
2 files changed, 8 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/kylin/blob/836b936b/webapp/app/js/controllers/cubeAdvanceSetting.js
----------------------------------------------------------------------
diff --git a/webapp/app/js/controllers/cubeAdvanceSetting.js b/webapp/app/js/controllers/cubeAdvanceSetting.js
index 742490d..69dba2b 100644
--- a/webapp/app/js/controllers/cubeAdvanceSetting.js
+++ b/webapp/app/js/controllers/cubeAdvanceSetting.js
@@ -96,4 +96,11 @@ KylinApp.controller('CubeAdvanceSettingCtrl', function ($scope, $modal, cubeConf
$scope.cubeMetaFrame.auto_merge_time_ranges.push(item.mills);
})
}
+
+ if ($scope.state.mode == 'edit') {
+ $scope.$on('$destroy', function () {
+ $scope.cubeMetaFrame.auto_merge_time_ranges.sort(function(a, b){return a-b});
+ });
+ }
+
});
http://git-wip-us.apache.org/repos/asf/kylin/blob/836b936b/webapp/app/partials/cubeDesigner/advanced_settings.html
----------------------------------------------------------------------
diff --git a/webapp/app/partials/cubeDesigner/advanced_settings.html b/webapp/app/partials/cubeDesigner/advanced_settings.html
index e55cdbf..e983477 100755
--- a/webapp/app/partials/cubeDesigner/advanced_settings.html
+++ b/webapp/app/partials/cubeDesigner/advanced_settings.html
@@ -87,7 +87,7 @@
<div class="row" ng-if="state.mode=='view'">
<table class="table">
<tbody>
- <tr ng-repeat="timeRange in cubeMetaFrame.auto_merge_time_ranges">
+ <tr ng-repeat="timeRange in cubeMetaFrame.auto_merge_time_ranges | orderBy:'valueOf()' track by $index ">
<td>
{{timeRange | timeRangeFormat}}
</td>