+ (Core) Updated the Date picker to show the current date using Rock …

…time, instead of the date of the local machine. (Fixes #2543)
SparkDevNetwork · Sep 21, 2023 · 682d6f9 · 682d6f9
1 parent 21e3e55
commit 682d6f9
Showing 1 changed file with 6 additions and 5 deletions.
diff --git a/Rock/Web/UI/Controls/Pickers/DatePicker.cs b/Rock/Web/UI/Controls/Pickers/DatePicker.cs
@@ -210,18 +210,19 @@ private void RegisterJavascript()
 
             // Get current date format and make sure it has double-lower-case month and day designators for the js date picker to use
             var dateFormat = System.Threading.Thread.CurrentThread.CurrentUICulture.DateTimeFormat.ShortDatePattern;
-            dateFormat = dateFormat.Replace( "M", "m" ).Replace( "m", "mm" ).Replace( "mmmm", "mm" );
-            dateFormat = dateFormat.Replace( "d", "dd" ).Replace( "dddd", "dd" );
+            var jsDateFormat = dateFormat.Replace( "M", "m" ).Replace( "m", "mm" ).Replace( "mmmm", "mm" );
+            jsDateFormat = jsDateFormat.Replace( "d", "dd" ).Replace( "dddd", "dd" );
 
-            var endDateParam = ( this.AllowFutureDateSelection ) ? "" : "endDate: '" + RockDateTime.Today.ToString( "o" ) + "',";
-            var startDateParam = ( this.AllowPastDateSelection ) ? "" : "startDate: '" + RockDateTime.Today.ToString( "o" ) + "',";
+            // StartDate and EndDate are optional, and must match the format of the dateFormat (which is the format of the input)
+            var endDateParam = ( this.AllowFutureDateSelection ) ? "" : "endDate: '" + RockDateTime.Today.ToString( dateFormat ) + "',";
+            var startDateParam = ( this.AllowPastDateSelection ) ? "" : "startDate: '" + RockDateTime.Today.ToString( dateFormat ) + "',";
 
             var script = $@"Rock.controls.datePicker.initialize(
                 {{
                     id: '{this.ClientID}',
                     startView: {this.StartView.ConvertToInt()},
                     showOnFocus: {this.ShowOnFocus.ToString().ToLower()},
-                    format: '{dateFormat}',
+                    format: '{jsDateFormat}',
                     todayHighlight: {this.HighlightToday.ToString().ToLower()},
                     forceParse: {this.ForceParse.ToString().ToLower()},
                     postbackScript: '{postBackScript}',