Add Bind function

Author: lunny

modules/middlewares/cookie.go

@@ -26,6 +26,7 @@ func NewCookie(name, value string, maxAge int) *http.Cookie {
 }
 
 // SetCookie set the cookies
+// TODO: Copied from gitea.com/macaron/macaron and should be improved after macaron removed.
 func SetCookie(resp http.ResponseWriter, name string, value string, others ...interface{}) {
 	cookie := http.Cookie{}
 	cookie.Name = name

modules/options/static.go

@@ -133,7 +133,7 @@ func AssetNames() []string {
 	realFS := Assets.(vfsgen۰FS)
 	var results = make([]string, 0, len(realFS))
 	for k := range realFS {
-		results = append(results, "templates/"+k[1:])
+		results = append(results, k[1:])
 	}
 	return results
 }

routers/routes/chi.go

@@ -188,18 +188,16 @@ func Wrap(f func(ctx *gitea_context.DefaultContext)) http.HandlerFunc {
 }
 
 // Bind binding an obj to a handler
-func Bind(obj interface{}, handler http.HandlerFunc) http.HandlerFunc {
-	return http.HandlerFunc(func(resp http.ResponseWriter, req *http.Request) {
-		errs := binding.Bind(req, obj)
+func Bind(obj interface{}, handler func(ctx *gitea_context.DefaultContext)) http.HandlerFunc {
+	return Wrap(func(ctx *gitea_context.DefaultContext) {
+		errs := binding.Bind(ctx.Req, obj)
 		if errs.Len() > 0 {
-			ctx := gitea_context.GetDefaultContext(req)
 			ctx.Data["HasError"] = true
-			auth.AssignForm(obj, ctx.Data)
-			// FIXME:
-			//ctx.Flash(ErrorFlash, msg)
+			ctx.Flash(gitea_context.ErrorFlash, errs[0].Error())
 		}
-
-		handler(resp, req)
+		auth.AssignForm(obj, ctx.Data)
+		ctx.Data["form"] = obj
+		handler(ctx)
 	})
 }
 

routers/routes/install.go

@@ -44,7 +44,7 @@ func InstallRoutes() http.Handler {
 	r := chi.NewRouter()
 	r.Use(InstallInit)
 	r.Get("/", Wrap(Install))
-	r.Post("/", Bind(&forms.InstallForm{}, Wrap(InstallPost)))
+	r.Post("/", Bind(&forms.InstallForm{}, InstallPost))
 	r.NotFound(func(w http.ResponseWriter, req *http.Request) {
 		http.Redirect(w, req, setting.AppURL, 302)
 	})
@@ -88,9 +88,8 @@ func InstallInit(next http.Handler) http.Handler {
 			Session: session.GetSession(req),
 		}
 
-		req = context.WithDefaultContext(req, &ctx)
-		ctx.Req = req
-		next.ServeHTTP(resp, req)
+		ctx.Req = context.WithDefaultContext(req, &ctx)
+		next.ServeHTTP(resp, ctx.Req)
 	})
 }
 
@@ -170,12 +169,9 @@ func Install(ctx *context.DefaultContext) {
 
 // InstallPost response for submit install items
 func InstallPost(ctx *context.DefaultContext) {
-	var form forms.InstallForm
-	_ = ctx.Bind(&form)
+	form := ctx.Data["form"].(*forms.InstallForm)
 
-	var err error
 	ctx.Data["CurDbOption"] = form.DbType
-
 	if ctx.HasError() {
 		if ctx.HasValue("Err_SMTPUser") {
 			ctx.Data["Err_SMTP"] = true
@@ -190,14 +186,14 @@ func InstallPost(ctx *context.DefaultContext) {
 		return
 	}
 
+	var err error
 	if _, err = exec.LookPath("git"); err != nil {
 		ctx.RenderWithErr(ctx.Tr("install.test_git_failed", err), tplInstall, &form)
 		return
 	}
 
 	// Pass basic check, now test configuration.
 	// Test database setting.
-
 	setting.Database.Type = setting.GetDBTypeByName(form.DbType)
 	setting.Database.Host = form.DbHost
 	setting.Database.User = form.DbUser