You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kylin.apache.org by ma...@apache.org on 2016/03/02 06:42:05 UTC
[15/29] kylin git commit: KYLIN-1337 fix Nmuber sort issue
KYLIN-1337 fix Nmuber sort issue
Project: http://git-wip-us.apache.org/repos/asf/kylin/repo
Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/343ce34f
Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/343ce34f
Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/343ce34f
Branch: refs/heads/1.x-HBase1.1.3
Commit: 343ce34ff928bae618a05a30245644b41f2c30ab
Parents: 3998964
Author: janzhongi <ji...@ebay.com>
Authored: Fri Feb 26 13:23:43 2016 +0800
Committer: janzhongi <ji...@ebay.com>
Committed: Fri Feb 26 13:23:57 2016 +0800
----------------------------------------------------------------------
webapp/app/js/filters/filter.js | 6 +++++-
webapp/app/js/model/cubeConfig.js | 2 +-
2 files changed, 6 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/kylin/blob/343ce34f/webapp/app/js/filters/filter.js
----------------------------------------------------------------------
diff --git a/webapp/app/js/filters/filter.js b/webapp/app/js/filters/filter.js
index 980ebe9..53ef8b7 100755
--- a/webapp/app/js/filters/filter.js
+++ b/webapp/app/js/filters/filter.js
@@ -54,7 +54,11 @@ KylinApp
result = 1;
}
else {
- result = attriOfA.toLowerCase() > attriOfB.toLowerCase() ? 1 : attriOfA.toLowerCase() < attriOfB.toLowerCase() ? -1 : 0;
+ if(!isNaN(attriOfA)||!isNaN(attriOfB)){
+ result = attriOfA > attriOfB ? 1 : attriOfA < attriOfB ? -1 : 0;
+ }else{
+ result = attriOfA.toLowerCase() > attriOfB.toLowerCase() ? 1 : attriOfA.toLowerCase() < attriOfB.toLowerCase() ? -1 : 0;
+ }
}
return reverse ? -result : result;
});
http://git-wip-us.apache.org/repos/asf/kylin/blob/343ce34f/webapp/app/js/model/cubeConfig.js
----------------------------------------------------------------------
diff --git a/webapp/app/js/model/cubeConfig.js b/webapp/app/js/model/cubeConfig.js
index e1f25b8..1ceecaa 100644
--- a/webapp/app/js/model/cubeConfig.js
+++ b/webapp/app/js/model/cubeConfig.js
@@ -69,7 +69,7 @@ KylinApp.constant('cubeConfig', {
{attr: 'input_records_count', name: 'Source Records'},
{attr: 'last_build_time', name: 'Last Build Time'},
{attr: 'owner', name: 'Owner'},
- {attr: 'create_time', name: 'Create Time'}
+ {attr: 'create_time_utc', name: 'Create Time'}
],
partitionDateFormatOpt:[
'yyyy-MM-dd',