#33 Rename UseIsoDateTimeConverterInJson settings

nopSolutions · Feb 14, 2018 · c7f0f4d · c7f0f4d
1 parent b0dafb2
commit c7f0f4d
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 6 deletions.
diff --git a/src/Libraries/Nop.Core/Domain/Common/AdminAreaSettings.cs b/src/Libraries/Nop.Core/Domain/Common/AdminAreaSettings.cs
@@ -48,9 +48,9 @@ public class AdminAreaSettings : ISettings
         public string LastNewsTitleAdminArea { get; set; }
 
         /// <summary>
-        /// Gets or sets a value indicating whether to use IsoDateTimeConverter in JSON results (used for avoiding issue with dates in KendoUI grids)
+        /// Gets or sets a value indicating whether to use IsoDateFormat in JSON results (used for avoiding issue with dates in KendoUI grids)
         /// </summary>
-        public bool UseIsoDateTimeConverterInJson { get; set; }
+        public bool UseIsoDateFormatInJsonResult { get; set; }
 
         /// <summary>
         /// Indicates whether to use nested setting design

diff --git a/src/Libraries/Nop.Services/Installation/CodeFirstInstallationService.cs b/src/Libraries/Nop.Services/Installation/CodeFirstInstallationService.cs
@@ -6004,7 +6004,7 @@ protected virtual void InstallSettings(bool installSampleData)
                 RichEditorAdditionalSettings = null,
                 RichEditorAllowJavaScript = false,
                 UseRichEditorInMessageTemplates = false,
-                UseIsoDateTimeConverterInJson = true,
+                UseIsoDateFormatInJsonResult = true,
                 UseNestedSetting = true
             });
 

diff --git a/src/Presentation/Nop.Web/Areas/Admin/Controllers/BaseAdminController.cs b/src/Presentation/Nop.Web/Areas/Admin/Controllers/BaseAdminController.cs
@@ -78,11 +78,10 @@ protected virtual void SaveSelectedTabName(string tabName, string formKey, strin
         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 ?? false;
+            var useIsoDateFormat = EngineContext.Current.Resolve<AdminAreaSettings>()?.UseIsoDateFormatInJsonResult ?? false;
             var serializerSettings = EngineContext.Current.Resolve<IOptions<MvcJsonOptions>>()?.Value?.SerializerSettings 
                 ?? new JsonSerializerSettings();
-            if (useIsoDateTime)
+            if (useIsoDateFormat)
             {
                 serializerSettings.DateFormatHandling = DateFormatHandling.IsoDateFormat;
                 serializerSettings.DateTimeZoneHandling = DateTimeZoneHandling.Unspecified;

diff --git a/upgradescripts/4.00-4.10 (under development)/upgrade.sql b/upgradescripts/4.00-4.10 (under development)/upgrade.sql
@@ -1051,4 +1051,10 @@ BEGIN
     INSERT [Setting] ([Name], [Value], [StoreId])
     VALUES (N'commonsettings.sitemappagesize', N'200', 0)
 END
+GO
+
+--rename setting
+UPDATE [Setting] 
+SET [Name] = N'adminareasettings.useisodateformatinjsonresult' 
+WHERE [Name] = N'adminareasettings.useisodatetimeconverterinjson'
 GO