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/04 11:03:37 UTC

[02/10] 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/e6b38ead
Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/e6b38ead
Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/e6b38ead

Branch: refs/heads/1.x-HBase1.1.3
Commit: e6b38eadacf2cbed3e9ee9b82293966c8965b798
Parents: 7b94e7f
Author: Jason <ji...@163.com>
Authored: Wed Mar 2 17:58:34 2016 +0800
Committer: Jason <ji...@163.com>
Committed: Wed Mar 2 17:59:03 2016 +0800

----------------------------------------------------------------------
 webapp/app/js/directives/directives.js | 6 ++++++
 webapp/app/less/app.less               | 4 ++++
 2 files changed, 10 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/kylin/blob/e6b38ead/webapp/app/js/directives/directives.js
----------------------------------------------------------------------
diff --git a/webapp/app/js/directives/directives.js b/webapp/app/js/directives/directives.js
index ab4171b..dd1e5cf 100644
--- a/webapp/app/js/directives/directives.js
+++ b/webapp/app/js/directives/directives.js
@@ -214,6 +214,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/e6b38ead/webapp/app/less/app.less
----------------------------------------------------------------------
diff --git a/webapp/app/less/app.less b/webapp/app/less/app.less
index 19ff71b..7bf6b01 100644
--- a/webapp/app/less/app.less
+++ b/webapp/app/less/app.less
@@ -642,3 +642,7 @@ input[placeholder] {
 input:-moz-placeholder {
   text-overflow: ellipsis;
 }
+
+.dropdown-menu{
+  z-index:9999;
+}