Repository: kylin Updated Branches: refs/heads/1.5.4-rc1 78a9e7535 -> a3d2aec8e
KYLIN-2003 error start time Project: http://git-wip-us.apache.org/repos/asf/kylin/repo Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/a3d2aec8 Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/a3d2aec8 Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/a3d2aec8 Branch: refs/heads/1.5.4-rc1 Commit: a3d2aec8ef3b7287b6aeb949c908f372658b34c7 Parents: 78a9e75 Author: Jason <jiat...@163.com> Authored: Thu Sep 8 17:47:26 2016 +0800 Committer: Jason <jiat...@163.com> Committed: Thu Sep 8 17:48:29 2016 +0800 ---------------------------------------------------------------------- webapp/app/js/filters/filter.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/kylin/blob/a3d2aec8/webapp/app/js/filters/filter.js ---------------------------------------------------------------------- diff --git a/webapp/app/js/filters/filter.js b/webapp/app/js/filters/filter.js index 4e8d210..f9f7165 100755 --- a/webapp/app/js/filters/filter.js +++ b/webapp/app/js/filters/filter.js @@ -152,16 +152,16 @@ KylinApp var convertedMillis = item; if (gmttimezone.indexOf("GMT+") != -1) { var offset = gmttimezone.substr(4, 1); - convertedMillis = item + offset * 60 * 60000 + localOffset * 60000; + convertedMillis = new Date(item).getTime() + offset * 60 * 60000 + localOffset * 60000; } else if (gmttimezone.indexOf("GMT-") != -1) { var offset = gmttimezone.substr(4, 1); - convertedMillis = item - offset * 60 * 60000 + localOffset * 60000; + convertedMillis = new Date(item).getTime() - offset * 60 * 60000 + localOffset * 60000; } else { // return PST by default timezone = "PST"; - convertedMillis = item - 8 * 60 * 60000 + localOffset * 60000; + convertedMillis = new Date(item).getTime() - 8 * 60 * 60000 + localOffset * 60000; } return $filter('date')(convertedMillis, format) + " " + timezone;
