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 2015/06/08 12:54:14 UTC
incubator-kylin git commit: KYLIN-818,
measure returntype support integer ,
and add start/end time to hbase tab in cube, enhance UI in query page
Repository: incubator-kylin
Updated Branches:
refs/heads/0.7.1-staging [created] a7c28c363
KYLIN-818, measure returntype support integer ,and add start/end time to hbase tab in cube,enhance UI in query page
Project: http://git-wip-us.apache.org/repos/asf/incubator-kylin/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-kylin/commit/a7c28c36
Tree: http://git-wip-us.apache.org/repos/asf/incubator-kylin/tree/a7c28c36
Diff: http://git-wip-us.apache.org/repos/asf/incubator-kylin/diff/a7c28c36
Branch: refs/heads/0.7.1-staging
Commit: a7c28c36360ba8c9280b54cc57fca4068cc25355
Parents: 1dc1a37
Author: jiazhong <ji...@ebay.com>
Authored: Mon Jun 8 18:42:02 2015 +0800
Committer: jiazhong <ji...@ebay.com>
Committed: Mon Jun 8 18:43:43 2015 +0800
----------------------------------------------------------------------
webapp/app/js/controllers/cubeSchema.js | 2 +-
webapp/app/less/app.less | 2 +-
webapp/app/less/layout.less | 5 +++++
webapp/app/partials/cubes/cube_detail.html | 2 ++
webapp/app/partials/query/query_detail.html | 5 ++---
5 files changed, 11 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/a7c28c36/webapp/app/js/controllers/cubeSchema.js
----------------------------------------------------------------------
diff --git a/webapp/app/js/controllers/cubeSchema.js b/webapp/app/js/controllers/cubeSchema.js
index d8e490d..388edaa 100755
--- a/webapp/app/js/controllers/cubeSchema.js
+++ b/webapp/app/js/controllers/cubeSchema.js
@@ -128,7 +128,7 @@ KylinApp.controller('CubeSchemaCtrl', function ($scope, QueryService, UserServic
switch ($scope.newMeasure.function.expression) {
case "SUM":
- if (colType === "smallint" || colType === "int" || colType === "bigint") {
+ if (colType === "smallint" || colType === "int" || colType === "bigint"||colType==="integer") {
$scope.newMeasure.function.returntype = 'bigint';
} else {
if (colType.indexOf('decimal') != -1) {
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/a7c28c36/webapp/app/less/app.less
----------------------------------------------------------------------
diff --git a/webapp/app/less/app.less b/webapp/app/less/app.less
index 5675957..162c929 100644
--- a/webapp/app/less/app.less
+++ b/webapp/app/less/app.less
@@ -550,7 +550,7 @@ ul.messenger.messenger-fixed.messenger-on-top .messenger-message .messenger-mess
}
/** Enable the text selectable on notification of Messenger **/
-ul.messenger .messenger-message-inner {
+ul.messenger .messenger-message-inner ,.ngCellText{
-moz-user-select: text;
-webkit-user-select: text;
-o-user-select: text;
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/a7c28c36/webapp/app/less/layout.less
----------------------------------------------------------------------
diff --git a/webapp/app/less/layout.less b/webapp/app/less/layout.less
index b3ea6b6..d52d5f5 100644
--- a/webapp/app/less/layout.less
+++ b/webapp/app/less/layout.less
@@ -19,8 +19,13 @@
padding-top: 45px;
}
+body{
+ overflow: auto !important;
+}
+
.main-container {
padding-bottom: 45px;
+ min-width: 960px;
}
.main-content {
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/a7c28c36/webapp/app/partials/cubes/cube_detail.html
----------------------------------------------------------------------
diff --git a/webapp/app/partials/cubes/cube_detail.html b/webapp/app/partials/cubes/cube_detail.html
index 59f2d69..1fdad18 100755
--- a/webapp/app/partials/cubes/cube_detail.html
+++ b/webapp/app/partials/cubes/cube_detail.html
@@ -107,6 +107,8 @@
<ul>
<li>Region Count: <span class="red">{{table.regionCount}}</span></li>
<li>Size: <span class="red">{{table.tableSize | bytes:2}}</span></li>
+ <li>Start Time: <span class="red">{{table.dateRangeStart | reverseToGMT0}}</span></li>
+ <li>End Time: <span class="red">{{table.dateRangeEnd | reverseToGMT0}}</span></li>
</ul>
</div>
<div ng-if="cube.hbase">
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/a7c28c36/webapp/app/partials/query/query_detail.html
----------------------------------------------------------------------
diff --git a/webapp/app/partials/query/query_detail.html b/webapp/app/partials/query/query_detail.html
index 7157e9c..5ca9010 100644
--- a/webapp/app/partials/query/query_detail.html
+++ b/webapp/app/partials/query/query_detail.html
@@ -128,7 +128,7 @@
</div>
<div ng-if="curQuery.graph.show" class="row">
- <div class="col-xs-2">
+ <div class="col-xs-4 col-md-3">
<div class="graph_content">
<label>Graph Type</label>
@@ -174,8 +174,7 @@
</div>
</div>
</div>
-
- <div class="col-xs-10">
+ <div class="col-xs-8 col-md-9">
<div ng-if="curQuery.graph.data.length > 0">
<div ng-if="curQuery.graph.type.value == 'bar'">
<nvd3-multi-bar-chart