From bd23cbed20caea3d768f5992e7ad051ca1e80cad Mon Sep 17 00:00:00 2001
From: Mads Rasmussen <mads@umbraco.com>
Date: Mon, 19 Nov 2018 15:50:11 +0100
Subject: [PATCH] null checks clean up debug data

---
 .../datepicker/datepicker.controller.js       | 33 +++++++++----------
 .../datepicker/datepicker.html                | 11 -------
 2 files changed, 15 insertions(+), 29 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/datepicker/datepicker.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/datepicker/datepicker.controller.js
index e673b17a73..704fccbde1 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/datepicker/datepicker.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/datepicker/datepicker.controller.js
@@ -45,31 +45,28 @@ function dateTimePickerController($scope, notificationsService, assetsService, a
             $scope.serverTimeNeedsOffsetting = (-serverOffset !== localOffset);
         }
 
-        //get the current user to see if we can localize this picker
-        userService.getCurrentUser().then(function (user) {
+        const dateFormat = $scope.model.config.pickTime ? "Y-m-d H:i:S" : "Y-m-d";
 
-            const dateFormat = $scope.model.config.pickTime ? "Y-m-d H:i:S" : "Y-m-d";
-
-            // date picker config
-            $scope.datePickerConfig = {
-                enableTime: $scope.model.config.pickTime,
-                dateFormat: dateFormat,
-                time_24hr: true
-            };
-                
-            $scope.model.config.language = user.locale;
-
-            setDatePickerVal();
+        // date picker config
+        $scope.datePickerConfig = {
+            enableTime: $scope.model.config.pickTime,
+            dateFormat: dateFormat,
+            time_24hr: true
+        };
             
-        });
+        setDatePickerVal();
 
     }
 
     $scope.clearDate = function() {
         $scope.hasDatetimePickerValue = false;
-        $scope.model.datetimePickerValue = null;
-        $scope.model.value = null;
-        $scope.datePickerForm.datepicker.$setValidity("pickerError", true);
+        if($scope.model) {
+            $scope.model.datetimePickerValue = null;
+            $scope.model.value = null;
+        }
+        if($scope.datePickerForm && $scope.datePickerForm.datepicker) {
+            $scope.datePickerForm.datepicker.$setValidity("pickerError", true);
+        }
     }
 
     $scope.datePickerSetup = function(instance) {
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/datepicker/datepicker.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/datepicker/datepicker.html
index f9b5271e0a..47c9182650 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/datepicker/datepicker.html
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/datepicker/datepicker.html
@@ -42,16 +42,5 @@
             <a href ng-click="clearDate()"><i class="icon-delete"></i><small><localize key="content_removeDate">Clear date</localize></small></a>
         </p>
 
-        <div style="margin-top: 10px;">
-            <div>
-                <div class="bold">model.value</div>
-                {{model.value}}
-            </div>
-            <div>
-                <div class="bold">Date time picker value</div>
-                {{model.datetimePickerValue}}
-            </div>
-        </div>
-
     </ng-form>
 </div>