From fc3ed8a1de0e35eefff083176211c4eb61a264ca Mon Sep 17 00:00:00 2001 From: Bwko Date: Sat, 19 Nov 2016 12:43:10 +0100 Subject: [PATCH 1/2] Fix panic when no user is signed in See #188 --- routers/repo/middlewares.go | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/routers/repo/middlewares.go b/routers/repo/middlewares.go index 757a049ab7..b16b003cfe 100644 --- a/routers/repo/middlewares.go +++ b/routers/repo/middlewares.go @@ -23,6 +23,10 @@ func SetEditorconfigIfExists(ctx *context.Context) { } func SetDiffViewStyle(ctx *context.Context) { + if !ctx.IsSigned { + return + } + var ( userStyle = ctx.User.DiffViewStyle queryStyle = ctx.Query("style") From 7b75d93f3da42a9ea1783b0cb85f88977549cf05 Mon Sep 17 00:00:00 2001 From: Bwko Date: Sat, 19 Nov 2016 16:53:34 +0100 Subject: [PATCH 2/2] Fix for anonymous users to switch views --- routers/repo/middlewares.go | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/routers/repo/middlewares.go b/routers/repo/middlewares.go index b16b003cfe..11b0009dbf 100644 --- a/routers/repo/middlewares.go +++ b/routers/repo/middlewares.go @@ -23,14 +23,16 @@ func SetEditorconfigIfExists(ctx *context.Context) { } func SetDiffViewStyle(ctx *context.Context) { + queryStyle := ctx.Query("style") + if !ctx.IsSigned { + ctx.Data["IsSplitStyle"] = queryStyle == "split" return } var ( - userStyle = ctx.User.DiffViewStyle - queryStyle = ctx.Query("style") - style string + userStyle = ctx.User.DiffViewStyle + style string ) if queryStyle == "unified" || queryStyle == "split" {