From 34d18a19a3cd2d16c03594ea9e1c3f423cb55687 Mon Sep 17 00:00:00 2001 From: Bryan Johnson Date: Mon, 21 Apr 2014 18:03:04 -0400 Subject: [PATCH 1/2] Minor grammatical fix for Disable Registration feature --- conf/app.ini | 2 +- modules/base/conf.go | 4 ++-- routers/user/user.go | 6 +++--- templates/admin/config.tmpl | 4 ++-- templates/user/signup.tmpl | 2 +- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/conf/app.ini b/conf/app.ini index 7dbbf60053..25fd41091f 100644 --- a/conf/app.ini +++ b/conf/app.ini @@ -53,7 +53,7 @@ RESET_PASSWD_CODE_LIVE_MINUTES = 180 ; User need to confirm e-mail for registration REGISTER_EMAIL_CONFIRM = false ; Does not allow register and admin create account only -DISENABLE_REGISTERATION = false +DISABLE_REGISTRATION = false ; User must sign in to view anything. REQUIRE_SIGNIN_VIEW = false ; Cache avatar as picture diff --git a/modules/base/conf.go b/modules/base/conf.go index 48ba46583a..abb67f6d8f 100644 --- a/modules/base/conf.go +++ b/modules/base/conf.go @@ -84,7 +84,7 @@ var ( var Service struct { RegisterEmailConfirm bool - DisenableRegisteration bool + DisableRegistration bool RequireSignInView bool EnableCacheAvatar bool NotifyMail bool @@ -116,7 +116,7 @@ var logLevels = map[string]string{ func newService() { Service.ActiveCodeLives = Cfg.MustInt("service", "ACTIVE_CODE_LIVE_MINUTES", 180) Service.ResetPwdCodeLives = Cfg.MustInt("service", "RESET_PASSWD_CODE_LIVE_MINUTES", 180) - Service.DisenableRegisteration = Cfg.MustBool("service", "DISENABLE_REGISTERATION", false) + Service.DisableRegistration = Cfg.MustBool("service", "DISABLE_REGISTRATION", false) Service.RequireSignInView = Cfg.MustBool("service", "REQUIRE_SIGNIN_VIEW", false) Service.EnableCacheAvatar = Cfg.MustBool("service", "ENABLE_CACHE_AVATAR", false) } diff --git a/routers/user/user.go b/routers/user/user.go index 91b51ceec9..7decd72d4e 100644 --- a/routers/user/user.go +++ b/routers/user/user.go @@ -169,8 +169,8 @@ func SignUp(ctx *middleware.Context) { ctx.Data["Title"] = "Sign Up" ctx.Data["PageIsSignUp"] = true - if base.Service.DisenableRegisteration { - ctx.Data["DisenableRegisteration"] = true + if base.Service.DisableRegistration { + ctx.Data["DisableRegistration"] = true ctx.HTML(200, "user/signup") return } @@ -208,7 +208,7 @@ func SignUpPost(ctx *middleware.Context, form auth.RegisterForm) { ctx.Data["Title"] = "Sign Up" ctx.Data["PageIsSignUp"] = true - if base.Service.DisenableRegisteration { + if base.Service.DisableRegistration { ctx.Handle(403, "user.SignUpPost", nil) return } diff --git a/templates/admin/config.tmpl b/templates/admin/config.tmpl index 8263763d0c..d25d40275a 100644 --- a/templates/admin/config.tmpl +++ b/templates/admin/config.tmpl @@ -62,8 +62,8 @@
Register Email Confirmation
-
Disenable Registeration
-
+
Disable Registration
+
Require Sign In View
Mail Notification
diff --git a/templates/user/signup.tmpl b/templates/user/signup.tmpl index d6af74c1a8..578ffa9eed 100644 --- a/templates/user/signup.tmpl +++ b/templates/user/signup.tmpl @@ -3,7 +3,7 @@
{{.CsrfTokenHtml}} - {{if .DisenableRegisteration}} + {{if .DisableRegistration}} Sorry, registration has been disabled. Please contact the site administrator. {{else}} {{if .IsSocialLogin}} From b32407456a767aae4a7a45680302203013883fa1 Mon Sep 17 00:00:00 2001 From: Pierre Baillet Date: Tue, 22 Apr 2014 11:11:11 +0200 Subject: [PATCH 2/2] Typos - Very small typo fixes --- serve.go | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/serve.go b/serve.go index 4e410b6252..321227957f 100644 --- a/serve.go +++ b/serve.go @@ -116,8 +116,8 @@ func runServ(k *cli.Context) { repoPath := strings.Trim(args, "'") rr := strings.SplitN(repoPath, "/", 2) if len(rr) != 2 { - println("Unavilable repository", args) - qlog.Fatalf("Unavilable repository %v", args) + println("Unavailable repository", args) + qlog.Fatalf("Unavailable repository %v", args) } repoUserName := rr[0] repoName := strings.TrimSuffix(rr[1], ".git") @@ -136,7 +136,7 @@ func runServ(k *cli.Context) { case isWrite: has, err := models.HasAccess(user.LowerName, path.Join(repoUserName, repoName), models.AU_WRITABLE) if err != nil { - println("Inernel error:", err) + println("Internal error:", err) qlog.Fatal(err) } else if !has { println("You have no right to write this repository") @@ -155,13 +155,13 @@ func runServ(k *cli.Context) { has, err := models.HasAccess(user.Name, path.Join(repoUserName, repoName), models.AU_READABLE) if err != nil { - println("Inernel error") + println("Internal error") qlog.Fatal(err) } if !has { has, err = models.HasAccess(user.Name, repoPath, models.AU_WRITABLE) if err != nil { - println("Inernel error") + println("Internal error") qlog.Fatal(err) } }