From a0bcfeddcc6631a48d73dfb6fd3e88a96fa7d146 Mon Sep 17 00:00:00 2001
From: Nathan Woulfe <nathan@nathanw.com.au>
Date: Thu, 4 Jul 2019 11:48:02 +1000
Subject: [PATCH] fix date range formatting on flatpickr - 'to' wasnt displayed
 after choosing a range

---
 .../views/logviewer/overview.controller.js    | 24 ++++++++++++-------
 .../src/views/logviewer/overview.html         |  2 +-
 2 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/logviewer/overview.controller.js b/src/Umbraco.Web.UI.Client/src/views/logviewer/overview.controller.js
index 5cee21668e..79ac8af5f8 100644
--- a/src/Umbraco.Web.UI.Client/src/views/logviewer/overview.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/logviewer/overview.controller.js
@@ -43,14 +43,20 @@
         vm.searchLogQuery = searchLogQuery;
         vm.findMessageTemplate = findMessageTemplate;
         
-        function preFlightCheck(){
-            vm.loading = true;
+        function preFlightCheck(instance){
+            vm.loading = true;          
+
+            
             //Do our pre-flight check (to see if we can view logs)
             //IE the log file is NOT too big such as 1GB & crash the site
             logViewerResource.canViewLogs(vm.startDate, vm.endDate).then(function(result){
                 vm.loading = false;
                 vm.canLoadLogs = result;
 
+                if (instance) {
+                    instance.setDate(vm.period);
+                }
+                
                 if(result){
                     //Can view logs - so initalise
                     init();
@@ -117,7 +123,7 @@
             $q.all([savedSearches, numOfErrors, logCounts, commonMsgs]).then(function() {
                 vm.loading = false;
             });
-
+            
             $timeout(function () {
                 navigationService.syncTree({ tree: "logViewer", path: "-1" });
             });
@@ -146,9 +152,9 @@
             mode: "range",
             maxDate: "today",
             conjunction: " to "
-        };
-        
-        vm.dateRangeChange = function(selectedDates) {
+        };        
+            
+        vm.dateRangeChange = function(selectedDates, dateStr, instance) {
             
             if(selectedDates.length > 0){
                 vm.startDate = selectedDates[0].toIsoDateString();
@@ -158,9 +164,9 @@
                     vm.period = [vm.startDate];
                 }else{
                     vm.period = [vm.startDate, vm.endDate];
-                }
-                
-                preFlightCheck();
+                }                
+                                
+                preFlightCheck(instance);
             }
 
         }
diff --git a/src/Umbraco.Web.UI.Client/src/views/logviewer/overview.html b/src/Umbraco.Web.UI.Client/src/views/logviewer/overview.html
index 896cb17da7..854bed755f 100644
--- a/src/Umbraco.Web.UI.Client/src/views/logviewer/overview.html
+++ b/src/Umbraco.Web.UI.Client/src/views/logviewer/overview.html
@@ -78,7 +78,7 @@
                             class="datepicker"
                             ng-model="vm.period"
                             options="vm.config"
-                            on-close="vm.dateRangeChange(selectedDates)">
+                            on-close="vm.dateRangeChange(selectedDates, dateStr, instance)">
                         </umb-flatpickr>
                     </umb-box>