Merge pull request #172 from cloudspokes/timezone-fix

wenhui-wd · wenhui-wd · commit 7e728336aa16 · 2014-04-04T21:40:38.000+08:00
Timezone fix
diff --git a/initializers/helper.js b/initializers/helper.js
@@ -1101,7 +1101,7 @@ helper.checkDates = function (startDate, endDate) {
  */
 helper.formatDate = function (date, format) {
     if (date) {
-        return moment(date).utc().format(format);
+        return date.substring(0, format.length);
     }
     return '';
 };
diff --git a/package.json b/package.json
@@ -26,7 +26,7 @@
     "bigdecimal": "0.6.1",
     "bignum": "0.6.2",
     "java": "0.2.9",
-    "informix-wrapper": "git://github.com/cloudspokes/informix-wrapper.git#1b3c12d90dba5b464d2f0a54a11953b1d68dc262",
+    "informix-wrapper": "git://github.com/cloudspokes/informix-wrapper.git#ae513d6c27d14acaef52092165831dcf23fc83dd",
     "forums-wrapper": "git://github.com/cloudspokes/forums-wrapper.git#9066f062e4e2a97b3de89e047a3b022443e7dd83",
     "asn1": "*",
     "crypto": ">= 0.0.3",

Original file line number	Diff line number	Diff line change
`@@ -1101,7 +1101,7 @@ helper.checkDates = function (startDate, endDate) {`
`1101`	`1101`	`*/`
`1102`	`1102`	`helper.formatDate = function (date, format) {`
`1103`	`1103`	`if (date) {`
`1104`		`- return moment(date).utc().format(format);`
	`1104`	`+ return date.substring(0, format.length);`
`1105`	`1105`	`}`
`1106`	`1106`	`return '';`
`1107`	`1107`	`};`