clarify code

Author: wxiaoguang

modules/context/api.go

@@ -378,6 +378,15 @@ func (ctx *APIContext) HasAPIError() bool {
 	return hasErr.(bool)
 }
 
+// GetErrMsg returns error message in form validation.
+func (ctx *APIContext) GetErrMsg() string {
+	msg, _ := ctx.Data["ErrorMsg"].(string)
+	if msg == "" {
+		msg = "invalid form data"
+	}
+	return msg
+}
+
 // NotFoundOrServerError use error check function to determine if the error
 // is about not found. It responds with 404 status code for not found error,
 // or error context description for logging purpose of 500 server error.

modules/context/base.go

@@ -34,10 +34,9 @@ type Base struct {
 
 	Resp ResponseWriter
 	Req  *http.Request
+	Data middleware.ContextData // data used by MVC templates, it's also used to pass data between middlewares/handler
 
 	Locale translation.Locale
-
-	Data middleware.ContextData // data used by MVC templates
 }
 
 func (b *Base) Deadline() (deadline time.Time, ok bool) {
@@ -75,15 +74,6 @@ func (b *Base) GetData() middleware.ContextData {
 	return b.Data
 }
 
-func (b *Base) GetErrMsg() string {
-	return b.Data["ErrorMsg"].(string)
-}
-
-func (b *Base) HasValue(name string) bool {
-	_, ok := b.Data[name]
-	return ok
-}
-
 // AppendAccessControlExposeHeaders append headers by name to "Access-Control-Expose-Headers" header
 func (b *Base) AppendAccessControlExposeHeaders(names ...string) {
 	val := b.RespHeader().Get("Access-Control-Expose-Headers")

modules/context/context.go

@@ -190,3 +190,12 @@ func (ctx *Context) HasError() bool {
 	ctx.Data["Flash"] = ctx.Flash
 	return hasErr.(bool)
 }
+
+// GetErrMsg returns error message in form validation.
+func (ctx *Context) GetErrMsg() string {
+	msg, _ := ctx.Data["ErrorMsg"].(string)
+	if msg == "" {
+		msg = "invalid form data"
+	}
+	return msg
+}

modules/context/response.go

@@ -10,10 +10,9 @@ import (
 // ResponseWriter represents a response writer for HTTP
 type ResponseWriter interface {
 	http.ResponseWriter
-	Flush()
+	http.Flusher
 	Status() int
 	Before(func(ResponseWriter))
-	Size() int
 }
 
 var _ ResponseWriter = &Response{}
@@ -27,11 +26,6 @@ type Response struct {
 	beforeExecuted bool
 }
 
-// Size return written size
-func (r *Response) Size() int {
-	return r.written
-}
-
 // Write writes bytes to HTTP endpoint
 func (r *Response) Write(bs []byte) (int, error) {
 	if !r.beforeExecuted {
@@ -65,7 +59,7 @@ func (r *Response) WriteHeader(statusCode int) {
 	}
 }
 
-// Flush flush cached data
+// Flush flushes cached data
 func (r *Response) Flush() {
 	if f, ok := r.ResponseWriter.(http.Flusher); ok {
 		f.Flush()

routers/install/install.go

@@ -247,15 +247,8 @@ func SubmitInstall(ctx *context.Context) {
 	ctx.Data["CurDbType"] = form.DbType
 
 	if ctx.HasError() {
-		if ctx.HasValue("Err_SMTPUser") {
-			ctx.Data["Err_SMTP"] = true
-		}
-		if ctx.HasValue("Err_AdminName") ||
-			ctx.HasValue("Err_AdminPasswd") ||
-			ctx.HasValue("Err_AdminEmail") {
-			ctx.Data["Err_Admin"] = true
-		}
-
+		ctx.Data["Err_SMTP"] = ctx.Data["Err_SMTPUser"] != nil
+		ctx.Data["Err_Admin"] = ctx.Data["Err_AdminName"] != nil || ctx.Data["Err_AdminPasswd"] != nil || ctx.Data["Err_AdminEmail"] != nil
 		ctx.HTML(http.StatusOK, tplInstall)
 		return
 	}