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 2016/03/10 08:50:26 UTC
[23/50] [abbrv] kylin git commit: KYLIN-1456 do not display date as
1970-01-01 as default value in datepicker-popup
KYLIN-1456 do not display date as 1970-01-01 as default value in datepicker-popup
Project: http://git-wip-us.apache.org/repos/asf/kylin/repo
Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/a5410681
Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/a5410681
Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/a5410681
Branch: refs/heads/master
Commit: a54106810a40c2a1065ee9b781f96fd2f1df298d
Parents: 1ea781f
Author: Jason <ji...@163.com>
Authored: Wed Mar 2 17:51:24 2016 +0800
Committer: Jason <ji...@163.com>
Committed: Wed Mar 2 17:51:36 2016 +0800
----------------------------------------------------------------------
webapp/app/js/directives/directives.js | 6 ++++++
webapp/app/less/app.less | 4 ++++
webapp/app/partials/cubeDesigner/refresh_settings.html | 2 +-
3 files changed, 11 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/kylin/blob/a5410681/webapp/app/js/directives/directives.js
----------------------------------------------------------------------
diff --git a/webapp/app/js/directives/directives.js b/webapp/app/js/directives/directives.js
index d07cee1..a9cd956 100644
--- a/webapp/app/js/directives/directives.js
+++ b/webapp/app/js/directives/directives.js
@@ -228,6 +228,12 @@ KylinApp.directive('kylinPagination', function ($parse, $q) {
require: 'ngModel',
link: function (scope, element, attrs, ctrl) {
ctrl.$formatters.push(function (value) {
+
+ //set null for 0
+ if(value===0){
+ return null;
+ }
+
//return value;
var date = new Date(value + (60000 * new Date().getTimezoneOffset()));
return date;
http://git-wip-us.apache.org/repos/asf/kylin/blob/a5410681/webapp/app/less/app.less
----------------------------------------------------------------------
diff --git a/webapp/app/less/app.less b/webapp/app/less/app.less
index 40d3280..b6b3131 100644
--- a/webapp/app/less/app.less
+++ b/webapp/app/less/app.less
@@ -784,3 +784,7 @@ input[placeholder] {
input:-moz-placeholder {
text-overflow: ellipsis;
}
+
+.dropdown-menu{
+ z-index:9999;
+}
http://git-wip-us.apache.org/repos/asf/kylin/blob/a5410681/webapp/app/partials/cubeDesigner/refresh_settings.html
----------------------------------------------------------------------
diff --git a/webapp/app/partials/cubeDesigner/refresh_settings.html b/webapp/app/partials/cubeDesigner/refresh_settings.html
index f371c33..15dd4af 100755
--- a/webapp/app/partials/cubeDesigner/refresh_settings.html
+++ b/webapp/app/partials/cubeDesigner/refresh_settings.html
@@ -131,7 +131,7 @@
Please input start date when partition date column is defined in model.
</small>
<!--vier model will convert use filter-->
- <span ng-if="state.mode=='view'&&metaModel.model.partition_desc.partition_date_column">{{(cubeMetaFrame.partition_date_start)|reverseToGMT0 }}</span>
+ <span ng-if="state.mode=='view' && metaModel.model.partition_desc.partition_date_column!=null && metaModel.model.partition_desc.partition_date_column">{{(cubeMetaFrame.partition_date_start)|reverseToGMT0 }}</span>
</div>
</div>
</div>