]> source.dussan.org Git - gitea.git/commitdiff
Fix UI issue
authorUnknwon <joe2010xtmf@163.com>
Sun, 14 Sep 2014 23:22:52 +0000 (19:22 -0400)
committerUnknwon <joe2010xtmf@163.com>
Sun, 14 Sep 2014 23:22:52 +0000 (19:22 -0400)
routers/install.go

index 7617f5bcc24939b54decd7121c87ef65306ff61f..26409814e2911f44ddb1a587115e746ab22e35f6 100644 (file)
@@ -176,6 +176,7 @@ func InstallPost(ctx *middleware.Context, form auth.InstallForm) {
 
        // Test repository root path.
        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)
                return
        }
@@ -187,12 +188,14 @@ func InstallPost(ctx *middleware.Context, form auth.InstallForm) {
        }
        // Does not check run user when the install lock is off.
        if form.RunUser != curUser {
+               ctx.Data["Err_RunUser"] = true
                ctx.RenderWithErr(ctx.Tr("install.run_user_not_match", form.RunUser, curUser), INSTALL, &form)
                return
        }
 
        // Check admin password.
        if form.AdminPasswd != form.ConfirmPasswd {
+               ctx.Data["Err_AdminPasswd"] = true
                ctx.RenderWithErr(ctx.Tr("form.password_not_match"), INSTALL, form)
                return
        }
@@ -240,6 +243,8 @@ func InstallPost(ctx *middleware.Context, form auth.InstallForm) {
                IsAdmin: true, IsActive: true}); err != nil {
                if err != models.ErrUserAlreadyExist {
                        setting.InstallLock = false
+                       ctx.Data["Err_AdminName"] = true
+                       ctx.Data["Err_AdminEmail"] = true
                        ctx.RenderWithErr(ctx.Tr("install.invalid_admin_setting", err), INSTALL, &form)
                        return
                }