Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
A
atlas
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
dataplatform
atlas
Commits
f37f3de7
Commit
f37f3de7
authored
6 years ago
by
Abhishek Kadam
Committed by
nixonrodrigues
6 years ago
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ATLAS-2764 :- Fix to load timezones from TimeZone.getAvailableIDs() on UI
Signed-off-by:
nixonrodrigues
<
nixon@apache.org
>
parent
f3f4fbfa
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
2 deletions
+6
-2
AddTimezoneItemView.js
dashboardv2/public/js/views/tag/AddTimezoneItemView.js
+4
-2
AdminResource.java
...in/java/org/apache/atlas/web/resources/AdminResource.java
+2
-0
No files found.
dashboardv2/public/js/views/tag/AddTimezoneItemView.js
View file @
f37f3de7
...
...
@@ -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'
)))
{
...
...
This diff is collapsed.
Click to expand it.
webapp/src/main/java/org/apache/atlas/web/resources/AdminResource.java
View file @
f37f3de7
...
...
@@ -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
();
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment