* Extended LANDINGPAGE config variable to logged in users and added switch for 'organizations' in addition to 'home' and 'explore'. * Updated comments. Signed-off-by: Mike Schaffer <mschaff@gmail.com> * Extended LANDINGPAGE config variable to trigger when user logs in and added switch for 'organizations' in addition to 'home' and 'explore'. Signed-off-by: Mike Schaffer <mschaff@gmail.com> * Extended LANDINGPAGE config variable to logged in users and added switch for 'organizations' in addition to 'home' and 'explore'. * Updated comments. Signed-off-by: Mike Schaffer <mschaff@gmail.com> * Extended LANDINGPAGE config variable to trigger when user logs in and added switch for 'organizations' in addition to 'home' and 'explore'. Signed-off-by: Mike Schaffer <mschaff@gmail.com> * Removed superfluous conditional and correct whitespace. Signed-off-by: Mike Schaffer <mschaff@gmail.com> * Update app.ini Reverted new line. * Formatting. Signed-off-by: Mike Schaffer <mschaff@gmail.com>tags/v1.4.0-rc1
@@ -164,7 +164,7 @@ STATIC_ROOT_PATH = | |||
APP_DATA_PATH = data | |||
; Application level GZIP support | |||
ENABLE_GZIP = false | |||
; Landing page for non-logged users, can be "home" or "explore" | |||
; Landing page, can be "home", "explore", or "organizations" | |||
LANDING_PAGE = home | |||
; Enables git-lfs support. true or false, default is false. | |||
LFS_START_SERVER = false |
@@ -56,8 +56,9 @@ type LandingPage string | |||
// enumerates all the landing page types | |||
const ( | |||
LandingPageHome LandingPage = "/" | |||
LandingPageExplore LandingPage = "/explore" | |||
LandingPageHome LandingPage = "/" | |||
LandingPageExplore LandingPage = "/explore" | |||
LandingPageOrganizations LandingPage = "/explore/organizations" | |||
) | |||
// MarkupParser defines the external parser configured in ini | |||
@@ -737,6 +738,8 @@ func NewContext() { | |||
switch sec.Key("LANDING_PAGE").MustString("home") { | |||
case "explore": | |||
LandingPageURL = LandingPageExplore | |||
case "organizations": | |||
LandingPageURL = LandingPageOrganizations | |||
default: | |||
LandingPageURL = LandingPageHome | |||
} |
@@ -97,7 +97,7 @@ func checkAutoLogin(ctx *context.Context) bool { | |||
ctx.SetCookie("redirect_to", "", -1, setting.AppSubURL) | |||
ctx.Redirect(redirectTo) | |||
} else { | |||
ctx.Redirect(setting.AppSubURL + "/") | |||
ctx.Redirect(setting.AppSubURL + string(setting.LandingPageURL)) | |||
} | |||
return true | |||
} |