From bd470abcf0ff17f31eda27b7386836828eba54d3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Tue, 3 Feb 2015 10:46:52 +0100 Subject: [PATCH] fontend styles updated --- grafana | 2 +- pkg/api/index.go | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/grafana b/grafana index 7fef460fa2b..dfef4727b68 160000 --- a/grafana +++ b/grafana @@ -1 +1 @@ -Subproject commit 7fef460fa2b6034429b205dc63d9b9f298f43fb4 +Subproject commit dfef4727b689d408b86d75c575646705bac79496 diff --git a/pkg/api/index.go b/pkg/api/index.go index 6ab2b77a9d5..0ae9ce5a055 100644 --- a/pkg/api/index.go +++ b/pkg/api/index.go @@ -23,6 +23,10 @@ func setIndexViewData(c *middleware.Context) error { IsGrafanaAdmin: c.IsGrafanaAdmin, } + if len(currentUser.Name) == 0 { + currentUser.Name = currentUser.Login + } + c.Data["User"] = currentUser c.Data["Settings"] = settings c.Data["AppUrl"] = setting.AppUrl