Fix UI issue

unknwon · unknwon · commit efb68a0a9657 · 2014-09-14T19:22:52.000-04:00
diff --git a/routers/install.go b/routers/install.go
@@ -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
 		}

Original file line number	Diff line number	Diff line change
`@@ -176,6 +176,7 @@ func InstallPost(ctx *middleware.Context, form auth.InstallForm) {`
`176`	`176`
`177`	`177`	`// Test repository root path.`
`178`	`178`	`if err := os.MkdirAll(form.RepoRootPath, os.ModePerm); err != nil {`
	`179`	`+ ctx.Data["Err_RepoRootPath"] = true`
`179`	`180`	`ctx.RenderWithErr(ctx.Tr("install.invalid_repo_path", err), INSTALL, &form)`
`180`	`181`	`return`
`181`	`182`	`}`
`@@ -187,12 +188,14 @@ func InstallPost(ctx *middleware.Context, form auth.InstallForm) {`
`187`	`188`	`}`
`188`	`189`	`// Does not check run user when the install lock is off.`
`189`	`190`	`if form.RunUser != curUser {`
	`191`	`+ ctx.Data["Err_RunUser"] = true`
`190`	`192`	`ctx.RenderWithErr(ctx.Tr("install.run_user_not_match", form.RunUser, curUser), INSTALL, &form)`
`191`	`193`	`return`
`192`	`194`	`}`
`193`	`195`
`194`	`196`	`// Check admin password.`
`195`	`197`	`if form.AdminPasswd != form.ConfirmPasswd {`
	`198`	`+ ctx.Data["Err_AdminPasswd"] = true`
`196`	`199`	`ctx.RenderWithErr(ctx.Tr("form.password_not_match"), INSTALL, form)`
`197`	`200`	`return`
`198`	`201`	`}`
`@@ -240,6 +243,8 @@ func InstallPost(ctx *middleware.Context, form auth.InstallForm) {`
`240`	`243`	`IsAdmin: true, IsActive: true}); err != nil {`
`241`	`244`	`if err != models.ErrUserAlreadyExist {`
`242`	`245`	`setting.InstallLock = false`
	`246`	`+ ctx.Data["Err_AdminName"] = true`
	`247`	`+ ctx.Data["Err_AdminEmail"] = true`
`243`	`248`	`ctx.RenderWithErr(ctx.Tr("install.invalid_admin_setting", err), INSTALL, &form)`
`244`	`249`	`return`
`245`	`250`	`}`