Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
N
nexpie-grafana-theme
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Registry
Registry
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
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Kornkitt Poolsup
nexpie-grafana-theme
Commits
6fb36e70
Commit
6fb36e70
authored
Jun 26, 2019
by
Sofia Papagiannaki
Committed by
Torkel Ödegaard
Jun 26, 2019
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ApiKeys: Fix check for UTC timezone (#17776)
getTimeZone() no longer returns an object, but a string
parent
40e5c4f8
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
1 additions
and
1 deletions
+1
-1
public/app/features/api-keys/ApiKeysPage.tsx
+1
-1
No files found.
public/app/features/api-keys/ApiKeysPage.tsx
View file @
6fb36e70
...
@@ -171,7 +171,7 @@ export class ApiKeysPage extends PureComponent<Props, any> {
...
@@ -171,7 +171,7 @@ export class ApiKeysPage extends PureComponent<Props, any> {
format
=
format
||
'YYYY-MM-DD HH:mm:ss'
;
format
=
format
||
'YYYY-MM-DD HH:mm:ss'
;
const
timezone
=
getTimeZone
(
store
.
getState
().
user
);
const
timezone
=
getTimeZone
(
store
.
getState
().
user
);
return
timezone
.
isUtc
?
date
.
utc
().
format
(
format
)
:
date
.
format
(
format
);
return
timezone
===
'utc'
?
date
.
utc
().
format
(
format
)
:
date
.
format
(
format
);
}
}
renderAddApiKeyForm
()
{
renderAddApiKeyForm
()
{
...
...
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