From 9eb91e6f0b175a1e96fd252924a52261ee595ba8 Mon Sep 17 00:00:00 2001 From: Frédéric Guillot Date: Fri, 29 Dec 2017 14:17:53 -0800 Subject: Make sure OAuth2 users cannot be associated multiple times --- server/ui/controller/controller.go | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'server/ui/controller/controller.go') diff --git a/server/ui/controller/controller.go b/server/ui/controller/controller.go index 8a45912b..8555c7b8 100644 --- a/server/ui/controller/controller.go +++ b/server/ui/controller/controller.go @@ -44,11 +44,12 @@ func (c *Controller) getCommonTemplateArgs(ctx *core.Context) (tplParams, error) } params := tplParams{ - "menu": "", - "user": user, - "countUnread": countUnread, - "csrf": ctx.CSRF(), - "flashMessage": ctx.FlashMessage(), + "menu": "", + "user": user, + "countUnread": countUnread, + "csrf": ctx.CSRF(), + "flashMessage": ctx.FlashMessage(), + "flashErrorMessage": ctx.FlashErrorMessage(), } return params, nil } -- cgit v1.2.3