diff options
author | Lunny Xiao <xiaolunwen@gmail.com> | 2016-11-18 11:03:03 +0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-11-18 11:03:03 +0800 |
commit | cf045b029cc11dc48c3a626441b7017710088823 (patch) | |
tree | f234f8ad8b8a548bda4c9d372ca5b9af95b0b40b /routers/install.go | |
parent | 91953ae9b421300eef79d58891dec7f2026e5d53 (diff) | |
download | gitea-cf045b029cc11dc48c3a626441b7017710088823.tar.gz gitea-cf045b029cc11dc48c3a626441b7017710088823.zip |
golint fixed for parts of routers root, dev, user and org dirs (#167)
* golint fixed for parts of routers root, dev and org dirs
* add user/auth.go golint fixed
* rename unnecessary exported to unexported and user dir golint fixed
Diffstat (limited to 'routers/install.go')
-rw-r--r-- | routers/install.go | 43 |
1 files changed, 24 insertions, 19 deletions
diff --git a/routers/install.go b/routers/install.go index 893a8168d6..5cc2136449 100644 --- a/routers/install.go +++ b/routers/install.go @@ -34,7 +34,8 @@ import ( ) const ( - INSTALL base.TplName = "install" + // tplInstall template for installation page + tplInstall base.TplName = "install" ) func checkRunMode() { @@ -49,6 +50,7 @@ func checkRunMode() { log.Info("Run Mode: %s", strings.Title(macaron.Env)) } +// NewServices init new services func NewServices() { setting.NewServices() mailer.NewContext() @@ -97,6 +99,7 @@ func GlobalInit() { } } +// InstallInit prepare for rendering installation page func InstallInit(ctx *context.Context) { if setting.InstallLock { ctx.Handle(404, "Install", errors.New("Installation is prohibited")) @@ -116,6 +119,7 @@ func InstallInit(ctx *context.Context) { ctx.Data["DbOptions"] = dbOpts } +// Install render installation page func Install(ctx *context.Context) { form := auth.InstallForm{} @@ -175,9 +179,10 @@ func Install(ctx *context.Context) { form.RequireSignInView = setting.Service.RequireSignInView auth.AssignForm(form, ctx.Data) - ctx.HTML(200, INSTALL) + ctx.HTML(200, tplInstall) } +// InstallPost response for submit install items func InstallPost(ctx *context.Context, form auth.InstallForm) { ctx.Data["CurDbOption"] = form.DbType @@ -191,12 +196,12 @@ func InstallPost(ctx *context.Context, form auth.InstallForm) { ctx.Data["Err_Admin"] = true } - ctx.HTML(200, INSTALL) + ctx.HTML(200, tplInstall) return } if _, err := exec.LookPath("git"); err != nil { - ctx.RenderWithErr(ctx.Tr("install.test_git_failed", err), INSTALL, &form) + ctx.RenderWithErr(ctx.Tr("install.test_git_failed", err), tplInstall, &form) return } @@ -214,12 +219,12 @@ func InstallPost(ctx *context.Context, form auth.InstallForm) { if (models.DbCfg.Type == "sqlite3" || models.DbCfg.Type == "tidb") && len(models.DbCfg.Path) == 0 { ctx.Data["Err_DbPath"] = true - ctx.RenderWithErr(ctx.Tr("install.err_empty_db_path"), INSTALL, &form) + ctx.RenderWithErr(ctx.Tr("install.err_empty_db_path"), tplInstall, &form) return } else if models.DbCfg.Type == "tidb" && strings.ContainsAny(path.Base(models.DbCfg.Path), ".-") { ctx.Data["Err_DbPath"] = true - ctx.RenderWithErr(ctx.Tr("install.err_invalid_tidb_name"), INSTALL, &form) + ctx.RenderWithErr(ctx.Tr("install.err_invalid_tidb_name"), tplInstall, &form) return } @@ -228,10 +233,10 @@ func InstallPost(ctx *context.Context, form auth.InstallForm) { if err := models.NewTestEngine(x); err != nil { if strings.Contains(err.Error(), `Unknown database type: sqlite3`) { ctx.Data["Err_DbType"] = true - ctx.RenderWithErr(ctx.Tr("install.sqlite3_not_available", "https://gogs.io/docs/installation/install_from_binary.html"), INSTALL, &form) + ctx.RenderWithErr(ctx.Tr("install.sqlite3_not_available", "https://gogs.io/docs/installation/install_from_binary.html"), tplInstall, &form) } else { ctx.Data["Err_DbSetting"] = true - ctx.RenderWithErr(ctx.Tr("install.invalid_db_setting", err), INSTALL, &form) + ctx.RenderWithErr(ctx.Tr("install.invalid_db_setting", err), tplInstall, &form) } return } @@ -240,7 +245,7 @@ func InstallPost(ctx *context.Context, form auth.InstallForm) { form.RepoRootPath = strings.Replace(form.RepoRootPath, "\\", "/", -1) if err := os.MkdirAll(form.RepoRootPath, os.ModePerm); err != nil { ctx.Data["Err_RepoRootPath"] = true - ctx.RenderWithErr(ctx.Tr("install.invalid_repo_path", err), INSTALL, &form) + ctx.RenderWithErr(ctx.Tr("install.invalid_repo_path", err), tplInstall, &form) return } @@ -248,14 +253,14 @@ func InstallPost(ctx *context.Context, form auth.InstallForm) { form.LogRootPath = strings.Replace(form.LogRootPath, "\\", "/", -1) if err := os.MkdirAll(form.LogRootPath, os.ModePerm); err != nil { ctx.Data["Err_LogRootPath"] = true - ctx.RenderWithErr(ctx.Tr("install.invalid_log_root_path", err), INSTALL, &form) + ctx.RenderWithErr(ctx.Tr("install.invalid_log_root_path", err), tplInstall, &form) return } currentUser, match := setting.IsRunUserMatchCurrentUser(form.RunUser) if !match { ctx.Data["Err_RunUser"] = true - ctx.RenderWithErr(ctx.Tr("install.run_user_not_match", form.RunUser, currentUser), INSTALL, &form) + ctx.RenderWithErr(ctx.Tr("install.run_user_not_match", form.RunUser, currentUser), tplInstall, &form) return } @@ -263,7 +268,7 @@ func InstallPost(ctx *context.Context, form auth.InstallForm) { if form.DisableRegistration && len(form.AdminName) == 0 { ctx.Data["Err_Services"] = true ctx.Data["Err_Admin"] = true - ctx.RenderWithErr(ctx.Tr("install.no_admin_and_disable_registration"), INSTALL, form) + ctx.RenderWithErr(ctx.Tr("install.no_admin_and_disable_registration"), tplInstall, form) return } @@ -271,13 +276,13 @@ func InstallPost(ctx *context.Context, form auth.InstallForm) { if len(form.AdminName) > 0 && len(form.AdminPasswd) == 0 { ctx.Data["Err_Admin"] = true ctx.Data["Err_AdminPasswd"] = true - ctx.RenderWithErr(ctx.Tr("install.err_empty_admin_password"), INSTALL, form) + ctx.RenderWithErr(ctx.Tr("install.err_empty_admin_password"), tplInstall, form) return } if form.AdminPasswd != form.AdminConfirmPasswd { ctx.Data["Err_Admin"] = true ctx.Data["Err_AdminPasswd"] = true - ctx.RenderWithErr(ctx.Tr("form.password_not_match"), INSTALL, form) + ctx.RenderWithErr(ctx.Tr("form.password_not_match"), tplInstall, form) return } @@ -347,12 +352,12 @@ func InstallPost(ctx *context.Context, form auth.InstallForm) { err := os.MkdirAll(filepath.Dir(setting.CustomConf), os.ModePerm) if err != nil { - ctx.RenderWithErr(ctx.Tr("install.save_config_failed", err), INSTALL, &form) + ctx.RenderWithErr(ctx.Tr("install.save_config_failed", err), tplInstall, &form) return } if err := cfg.SaveTo(setting.CustomConf); err != nil { - ctx.RenderWithErr(ctx.Tr("install.save_config_failed", err), INSTALL, &form) + ctx.RenderWithErr(ctx.Tr("install.save_config_failed", err), tplInstall, &form) return } @@ -372,7 +377,7 @@ func InstallPost(ctx *context.Context, form auth.InstallForm) { setting.InstallLock = false ctx.Data["Err_AdminName"] = true ctx.Data["Err_AdminEmail"] = true - ctx.RenderWithErr(ctx.Tr("install.invalid_admin_setting", err), INSTALL, &form) + ctx.RenderWithErr(ctx.Tr("install.invalid_admin_setting", err), tplInstall, &form) return } log.Info("Admin account already exist") @@ -381,11 +386,11 @@ func InstallPost(ctx *context.Context, form auth.InstallForm) { // Auto-login for admin if err := ctx.Session.Set("uid", u.ID); err != nil { - ctx.RenderWithErr(ctx.Tr("install.save_config_failed", err), INSTALL, &form) + ctx.RenderWithErr(ctx.Tr("install.save_config_failed", err), tplInstall, &form) return } if err := ctx.Session.Set("uname", u.Name); err != nil { - ctx.RenderWithErr(ctx.Tr("install.save_config_failed", err), INSTALL, &form) + ctx.RenderWithErr(ctx.Tr("install.save_config_failed", err), tplInstall, &form) return } } |