[atlas] branch branch-2.0 updated: ATLAS-3986: UI Allow user to update the date format from JAVA property file #1

[kbhatt]

This is an automated email from the ASF dual-hosted git repository.

kbhatt pushed a commit to branch branch-2.0
in repository https://gitbox.apache.org/repos/asf/atlas.git


The following commit(s) were added to refs/heads/branch-2.0 by this push:
     new 35c773a  ATLAS-3986: UI Allow user to update the date format from JAVA 
property file #1
35c773a is described below

commit 35c773a935b6af30efe35f85d60337caa017862c
Author: kevalbhatt <kbh...@apache.org>
AuthorDate: Mon Oct 26 11:44:31 2020 +0530

    ATLAS-3986: UI Allow user to update the date format from JAVA property file 
#1
    
    (cherry picked from commit 91926971551767abd9d2d34fff202d9df3c72f9b)
---
 dashboardv2/public/js/main.js          | 4 ++--
 dashboardv2/public/js/utils/Globals.js | 2 +-
 dashboardv2/public/js/utils/Utils.js   | 2 +-
 dashboardv3/public/js/main.js          | 4 ++--
 dashboardv3/public/js/utils/Globals.js | 2 +-
 dashboardv3/public/js/utils/Utils.js   | 2 +-
 6 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/dashboardv2/public/js/main.js b/dashboardv2/public/js/main.js
index 282c407..10d62eb 100644
--- a/dashboardv2/public/js/main.js
+++ b/dashboardv2/public/js/main.js
@@ -279,8 +279,8 @@ require(['App',
                         Globals.dateFormat = dateFormatSeperated[0]; //date
                     }
                 }
-                if (response['atlas.ui.date.timezone'] !== undefined) {
-                    Globals.isDateTimeZone = 
response['atlas.ui.date.timezone'];
+                if (response['atlas.ui.date.timezone.format.enabled'] !== 
undefined) {
+                    Globals.isTimezoneFormatEnabled = 
response['atlas.ui.date.timezone.format.enabled'];
                 }
             }
             --that.asyncFetchCounter;
diff --git a/dashboardv2/public/js/utils/Globals.js 
b/dashboardv2/public/js/utils/Globals.js
index 0a4a050..56c155c 100644
--- a/dashboardv2/public/js/utils/Globals.js
+++ b/dashboardv2/public/js/utils/Globals.js
@@ -44,7 +44,7 @@ define(["require"], function(require) {
     // Date Format
     Globals.dateTimeFormat = "MM/DD/YYYY hh:mm:ss A";
     Globals.dateFormat = "MM/DD/YYYY";
-    Globals.isDateTimeZone = true;
+    Globals.isTimezoneFormatEnabled = true;
 
     return Globals;
 });
\ No newline at end of file
diff --git a/dashboardv2/public/js/utils/Utils.js 
b/dashboardv2/public/js/utils/Utils.js
index 0fbe56a..bd80629 100644
--- a/dashboardv2/public/js/utils/Utils.js
+++ b/dashboardv2/public/js/utils/Utils.js
@@ -935,7 +935,7 @@ define(['require', 'utils/Globals', 'pnotify', 
'utils/Messages', 'utils/Enums',
             if (isValidDate === false && options && options.defaultDate !== 
false) {
                 dateValue = moment().format(dateFormat);
             }
-            if (Globals.isDateTimeZone) {
+            if (Globals.isTimezoneFormatEnabled) {
                 if (!options || options && options.zone !== false) {
                     dateValue += " (" + 
moment.tz(moment.tz.guess()).zoneAbbr() + ")";
                 }
diff --git a/dashboardv3/public/js/main.js b/dashboardv3/public/js/main.js
index a91cd97..a5f80dc 100644
--- a/dashboardv3/public/js/main.js
+++ b/dashboardv3/public/js/main.js
@@ -308,8 +308,8 @@ require(['App',
                         Globals.dateFormat = dateFormatSeperated[0]; //date
                     }
                 }
-                if (response['atlas.ui.date.timezone'] !== undefined) {
-                    Globals.isDateTimeZone = 
response['atlas.ui.date.timezone'];
+                if (response['atlas.ui.date.timezone.format.enabled'] !== 
undefined) {
+                    Globals.isTimezoneFormatEnabled = 
response['atlas.ui.date.timezone.format.enabled'];
                 }
             }
             --that.asyncFetchCounter;
diff --git a/dashboardv3/public/js/utils/Globals.js 
b/dashboardv3/public/js/utils/Globals.js
index 0a4a050..56c155c 100644
--- a/dashboardv3/public/js/utils/Globals.js
+++ b/dashboardv3/public/js/utils/Globals.js
@@ -44,7 +44,7 @@ define(["require"], function(require) {
     // Date Format
     Globals.dateTimeFormat = "MM/DD/YYYY hh:mm:ss A";
     Globals.dateFormat = "MM/DD/YYYY";
-    Globals.isDateTimeZone = true;
+    Globals.isTimezoneFormatEnabled = true;
 
     return Globals;
 });
\ No newline at end of file
diff --git a/dashboardv3/public/js/utils/Utils.js 
b/dashboardv3/public/js/utils/Utils.js
index c8f7a0b..eca406b 100644
--- a/dashboardv3/public/js/utils/Utils.js
+++ b/dashboardv3/public/js/utils/Utils.js
@@ -940,7 +940,7 @@ define(['require', 'utils/Globals', 'pnotify', 
'utils/Messages', 'utils/Enums',
             if (isValidDate === false && options && options.defaultDate !== 
false) {
                 dateValue = moment().format(dateFormat);
             }
-            if (Globals.isDateTimeZone) {
+            if (Globals.isTimezoneFormatEnabled) {
                 if (!options || options && options.zone !== false) {
                     dateValue += " (" + 
moment.tz(moment.tz.guess()).zoneAbbr() + ")";
                 }