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/3730113a Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/3730113a Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/3730113a Branch: refs/heads/1.4-rc Commit: 3730113a3a75060dddc79ad3ade3c62fff50b771 Parents: a540605 Author: Jason <jiat...@163.com> Authored: Wed Mar 2 17:42:34 2016 +0800 Committer: Jason <jiat...@163.com> Committed: Wed Mar 2 17:47:54 2016 +0800 ---------------------------------------------------------------------- webapp/app/js/directives/directives.js | 6 ++++++ webapp/app/less/app.less | 3 +++ webapp/app/partials/cubeDesigner/refresh_settings.html | 2 +- 3 files changed, 10 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/kylin/blob/3730113a/webapp/app/js/directives/directives.js ---------------------------------------------------------------------- diff --git a/webapp/app/js/directives/directives.js b/webapp/app/js/directives/directives.js index 1b51354..743e20b 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/3730113a/webapp/app/less/app.less ---------------------------------------------------------------------- diff --git a/webapp/app/less/app.less b/webapp/app/less/app.less index 3eaae3a..e6b291f 100644 --- a/webapp/app/less/app.less +++ b/webapp/app/less/app.less @@ -682,3 +682,6 @@ ul.messenger .messenger-message-inner,.ngCellText { input[placeholder] { text-overflow: ellipsis; } ::-moz-placeholder { text-overflow: ellipsis; } /* firefox 19+ */ input:-moz-placeholder { text-overflow: ellipsis; } +.dropdown-menu{ + z-index:9999; +} http://git-wip-us.apache.org/repos/asf/kylin/blob/3730113a/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 d1f478f..316f417 100755 --- a/webapp/app/partials/cubeDesigner/refresh_settings.html +++ b/webapp/app/partials/cubeDesigner/refresh_settings.html @@ -130,7 +130,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>
