From: Bill Erickson <berickxx@gmail.com>
Date: Fri, 5 Jul 2019 18:21:49 +0000 (-0400)
Subject: LP1834662 Allow date format defaults to persist.
X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=6c75e934453a3b842727ab000f035cf5112ba5e8;p=working%2FEvergreen.git

LP1834662 Allow date format defaults to persist.

Avoid clobbering the default date / time format strings set by the
FormatService.

Signed-off-by: Bill Erickson <berickxx@gmail.com>
Signed-off-by: Jane Sandberg <sandbej@linnbenton.edu>
---

diff --git a/Open-ILS/src/eg2/src/app/staff/resolver.service.ts b/Open-ILS/src/eg2/src/app/staff/resolver.service.ts
index 2c94ec76d3..94b469ee67 100644
--- a/Open-ILS/src/eg2/src/app/staff/resolver.service.ts
+++ b/Open-ILS/src/eg2/src/app/staff/resolver.service.ts
@@ -133,9 +133,17 @@ export class StaffResolver implements Resolve<Observable<any>> {
             'ui.staff.max_recent_patrons',
             'ui.staff.angular_catalog.enabled' // navbar
         ]).then(settings => {
-            this.format.wsOrgTimezone = settings['lib.timezone'];
-            this.format.dateFormat = settings['webstaff.format.dates'];
-            this.format.dateTimeFormat = settings['webstaff.format.date_and_time'];
+            // Avoid clobbering defaults
+            if (settings['lib.timezone']) {
+                this.format.wsOrgTimezone = settings['lib.timezone'];
+            }
+            if (settings['webstaff.format.dates']) {
+                this.format.dateFormat = settings['webstaff.format.dates'];
+            }
+            if (settings['webstaff.format.date_and_time']) {
+                this.format.dateTimeFormat =
+                    settings['webstaff.format.date_and_time'];
+            }
         });
     }
 }