#33 Further changes to properly format dates in Kendo grids

nopSolutions · Dec 19, 2017 · 377cff9 · 377cff9
1 parent 9ca86fb
commit 377cff9
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/src/Presentation/Nop.Web/Areas/Admin/Controllers/BaseAdminController.cs b/src/Presentation/Nop.Web/Areas/Admin/Controllers/BaseAdminController.cs
@@ -79,10 +79,12 @@ public override JsonResult Json(object data)
             //use IsoDateFormat on writing JSON text to fix issue with dates in KendoUI grid
             //TODO rename setting
             var useIsoDateTime = EngineContext.Current.Resolve<AdminAreaSettings>().UseIsoDateTimeConverterInJson;
-            var serializerSettings = new JsonSerializerSettings
+            var serializerSettings = new JsonSerializerSettings();
+            if (useIsoDateTime)
             {
-                DateFormatHandling = useIsoDateTime ? DateFormatHandling.IsoDateFormat : DateFormatHandling.MicrosoftDateFormat                
-            };
+                serializerSettings.DateFormatHandling = DateFormatHandling.IsoDateFormat;
+                serializerSettings.DateTimeZoneHandling = DateTimeZoneHandling.Unspecified;
+            }
 
             return base.Json(data, serializerSettings);
         }