Repository: atlas Updated Branches: refs/heads/branch-1.0 885cc3481 -> be4c0c03f
ATLAS-2764 :- Fix to load timezones from TimeZone.getAvailableIDs() on UI Signed-off-by: nixonrodrigues <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/atlas/repo Commit: http://git-wip-us.apache.org/repos/asf/atlas/commit/be4c0c03 Tree: http://git-wip-us.apache.org/repos/asf/atlas/tree/be4c0c03 Diff: http://git-wip-us.apache.org/repos/asf/atlas/diff/be4c0c03 Branch: refs/heads/branch-1.0 Commit: be4c0c03f64240ca198bfb5f3d7d493b8db27ba7 Parents: 885cc34 Author: Abhishek Kadam <[email protected]> Authored: Fri Jun 22 15:25:30 2018 +0530 Committer: nixonrodrigues <[email protected]> Committed: Fri Jun 22 17:09:43 2018 +0530 ---------------------------------------------------------------------- dashboardv2/public/js/views/tag/AddTimezoneItemView.js | 6 ++++-- .../java/org/apache/atlas/web/resources/AdminResource.java | 2 ++ 2 files changed, 6 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/atlas/blob/be4c0c03/dashboardv2/public/js/views/tag/AddTimezoneItemView.js ---------------------------------------------------------------------- diff --git a/dashboardv2/public/js/views/tag/AddTimezoneItemView.js b/dashboardv2/public/js/views/tag/AddTimezoneItemView.js index 3deab83..b2fc9af 100644 --- a/dashboardv2/public/js/views/tag/AddTimezoneItemView.js +++ b/dashboardv2/public/js/views/tag/AddTimezoneItemView.js @@ -19,9 +19,11 @@ define(['require', 'backbone', 'hbs!tmpl/tag/AddTimezoneView_tmpl', 'moment', + 'utils/Enums', + 'utils/Globals', 'moment-timezone', 'daterangepicker' -], function(require, Backbone, AddTimezoneViewTmpl, moment) { +], function(require, Backbone, AddTimezoneViewTmpl, moment, Enums, Globals) { 'use strict'; return Backbone.Marionette.ItemView.extend( @@ -89,7 +91,7 @@ define(['require', this.ui.timeZone.html(tzstr); this.ui.timeZone.select2({ - data: moment.tz.names() + data: Globals.userLogedIn.response.timezones }); if (!_.isEmpty(this.model.get('startTime')) || !_.isEmpty(this.model.get('endTime')) || !_.isEmpty(this.model.get('timeZone'))) { http://git-wip-us.apache.org/repos/asf/atlas/blob/be4c0c03/webapp/src/main/java/org/apache/atlas/web/resources/AdminResource.java ---------------------------------------------------------------------- diff --git a/webapp/src/main/java/org/apache/atlas/web/resources/AdminResource.java b/webapp/src/main/java/org/apache/atlas/web/resources/AdminResource.java index 5012d51..45a9bfd 100755 --- a/webapp/src/main/java/org/apache/atlas/web/resources/AdminResource.java +++ b/webapp/src/main/java/org/apache/atlas/web/resources/AdminResource.java @@ -90,6 +90,7 @@ public class AdminResource { private static final String isEntityCreateAllowed = "atlas.entity.create.allowed"; private static final String editableEntityTypes = "atlas.ui.editable.entity.types"; private static final String DEFAULT_EDITABLE_ENTITY_TYPES = "hdfs_path,hbase_table,hbase_column,hbase_column_family,kafka_topic,hbase_namespace"; + private static final List TIMEZONE_LIST = Arrays.asList(TimeZone.getAvailableIDs()); @Context private HttpServletRequest httpServletRequest; @@ -270,6 +271,7 @@ public class AdminResource { responseData.put(editableEntityTypes, getEditableEntityTypes(atlasProperties)); responseData.put("userName", userName); responseData.put("groups", groups); + responseData.put("timezones", TIMEZONE_LIST); response = Response.ok(AtlasJson.toV1Json(responseData)).build();
