Reduce conditionals in signin/signup inner forms

by always using SignInLink and SignUpLink in the form action

diff --git a/routers/user/auth.go b/routers/user/auth.go
index 4827f38b5245a1cb889e3a093bdf6b1c931e7b1e..ba20dc7d42ff299734cf36686f8b2d4d0c4a138f 100644 (file)
--- a/routers/user/auth.go
+++ b/routers/user/auth.go
@@ -120,6 +120,7 @@ func SignIn(ctx *context.Context) {
        }
        ctx.Data["OAuth2Providers"] = oauth2Providers
        ctx.Data["Title"] = ctx.Tr("sign_in")
+       ctx.Data["SignInLink"] = setting.AppSubURL + "/user/login"
        ctx.Data["PageIsSignIn"] = true
        ctx.Data["PageIsLogin"] = true
 
@@ -128,16 +129,16 @@ func SignIn(ctx *context.Context) {
 
 // SignInPost response for sign in request
 func SignInPost(ctx *context.Context, form auth.SignInForm) {
-       ctx.Data["Title"] = ctx.Tr("sign_in")
-       ctx.Data["PageIsSignIn"] = true
-       ctx.Data["PageIsLogin"] = true
-
        oauth2Providers, err := models.GetActiveOAuth2Providers()
        if err != nil {
                ctx.Handle(500, "UserSignIn", err)
                return
        }
        ctx.Data["OAuth2Providers"] = oauth2Providers
+       ctx.Data["Title"] = ctx.Tr("sign_in")
+       ctx.Data["SignInLink"] = setting.AppSubURL + "/user/login"
+       ctx.Data["PageIsSignIn"] = true
+       ctx.Data["PageIsLogin"] = true
 
        if ctx.HasError() {
                ctx.HTML(200, tplSignIn)
@@ -700,6 +701,8 @@ func SignOut(ctx *context.Context) {
 func SignUp(ctx *context.Context) {
        ctx.Data["Title"] = ctx.Tr("sign_up")
 
+       ctx.Data["SignUpLink"] = setting.AppSubURL + "/user/sign_up"
+
        ctx.Data["EnableCaptcha"] = setting.Service.EnableCaptcha
 
        ctx.Data["DisableRegistration"] = setting.Service.DisableRegistration
@@ -711,6 +714,8 @@ func SignUp(ctx *context.Context) {
 func SignUpPost(ctx *context.Context, cpt *captcha.Captcha, form auth.RegisterForm) {
        ctx.Data["Title"] = ctx.Tr("sign_up")
 
+       ctx.Data["SignUpLink"] = setting.AppSubURL + "/user/sign_up"
+
        ctx.Data["EnableCaptcha"] = setting.Service.EnableCaptcha
 
        if setting.Service.DisableRegistration {

diff --git a/templates/user/auth/signin_inner.tmpl b/templates/user/auth/signin_inner.tmpl
index c8df0870b705b632881f74fb5616111aa5fa748f..c89f2f358d551c9e1b68650a63b28cd961f89068 100644 (file)
--- a/templates/user/auth/signin_inner.tmpl
+++ b/templates/user/auth/signin_inner.tmpl
@@ -5,7 +5,7 @@
                        {{.i18n.Tr "auth.login_userpass"}}
                </h4>
                <div class="ui attached segment">
-                       <form class="ui form" action="{{if not .LinkAccountMode}}{{.Link}}{{else}}{{.SignInLink}}{{end}}" method="post">
+                       <form class="ui form" action="{{.SignInLink}}" method="post">
                        {{.CsrfTokenHtml}}
                        <div class="required inline field {{if and (.Err_UserName) (or (not .LinkAccountMode) (and .LinkAccountMode .LinkAccountModeSignIn))}}error{{end}}">
                                <label for="user_name">{{.i18n.Tr "home.uname_holder"}}</label>

diff --git a/templates/user/auth/signup_inner.tmpl b/templates/user/auth/signup_inner.tmpl
index 869f3d5342cc9d16a520db24a92ff946081261cd..52386f6dcf633ff0014cff62a0f1e55b4894dcb0 100644 (file)
--- a/templates/user/auth/signup_inner.tmpl
+++ b/templates/user/auth/signup_inner.tmpl
@@ -1,7 +1,7 @@
 <div class="user signup{{if .LinkAccountMode}} icon{{end}}">
        <div class="ui middle very relaxed page grid">
                <div class="column">
-                       <form class="ui form" action="{{if not .LinkAccountMode}}{{.Link}}{{else}}{{.SignUpLink}}{{end}}" method="post">
+                       <form class="ui form" action="{{.SignUpLink}}" method="post">
                                {{.CsrfTokenHtml}}
                                <h3 class="ui top attached header">
                                        {{.i18n.Tr "sign_up"}}
@@ -56,4 +56,4 @@
                        </form>
                </div>
        </div>
-</div>
\ No newline at end of file
+</div>