Merge branch 'master' of github.com:astaxie/beego

@@ -16,7 +16,6 @@ type Context struct {
 func (ctx *Context) Redirect(status int, localurl string) {
 func (ctx *Context) Redirect(status int, localurl string) {
 	ctx.Output.Header("Location", localurl)
 	ctx.Output.Header("Location", localurl)
 	ctx.Output.SetStatus(status)
 	ctx.Output.SetStatus(status)
-	ctx.Output.Body([]byte(" "))
 }
 }
 
 
 func (ctx *Context) Abort(status int, body string) {
 func (ctx *Context) Abort(status int, body string) {

@@ -24,10 +24,15 @@ import (
 	"github.com/astaxie/beego/session"
 	"github.com/astaxie/beego/session"
 )
 )
 
 
+var (
+	USERSTOPRUN = errors.New("User stop run")
+)
+
 type Controller struct {
 type Controller struct {
 	Ctx            *context.Context
 	Ctx            *context.Context
 	Data           map[interface{}]interface{}
 	Data           map[interface{}]interface{}
-	ChildName     string
+	controllerName string
+	actionName     string
 	TplNames       string
 	TplNames       string
 	Layout         string
 	Layout         string
 	TplExt         string
 	TplExt         string
@@ -39,7 +44,7 @@ type Controller struct {
 }
 }
 
 
 type ControllerInterface interface {
 type ControllerInterface interface {
-	Init(ct *context.Context, childName string, app interface{})
+	Init(ct *context.Context, controllerName, actionName string, app interface{})
 	Prepare()
 	Prepare()
 	Get()
 	Get()
 	Post()
 	Post()
@@ -52,11 +57,12 @@ type ControllerInterface interface {
 	Render() error
 	Render() error
 }
 }
 
 
-func (c *Controller) Init(ctx *context.Context, childName string, app interface{}) {
+func (c *Controller) Init(ctx *context.Context, controllerName, actionName string, app interface{}) {
 	c.Data = make(map[interface{}]interface{})
 	c.Data = make(map[interface{}]interface{})
 	c.Layout = ""
 	c.Layout = ""
 	c.TplNames = ""
 	c.TplNames = ""
-	c.ChildName = childName
+	c.controllerName = controllerName
+	c.actionName = actionName
 	c.Ctx = ctx
 	c.Ctx = ctx
 	c.TplExt = "tpl"
 	c.TplExt = "tpl"
 	c.AppController = app
 	c.AppController = app
@@ -119,7 +125,7 @@ func (c *Controller) RenderBytes() ([]byte, error) {
 	//if the controller has set layout, then first get the tplname's content set the content to the layout
 	//if the controller has set layout, then first get the tplname's content set the content to the layout
 	if c.Layout != "" {
 	if c.Layout != "" {
 		if c.TplNames == "" {
 		if c.TplNames == "" {
-			c.TplNames = c.ChildName + "/" + strings.ToLower(c.Ctx.Request.Method) + "." + c.TplExt
+			c.TplNames = strings.ToLower(c.controllerName) + "/" + strings.ToLower(c.actionName) + "." + c.TplExt
 		}
 		}
 		if RunMode == "dev" {
 		if RunMode == "dev" {
 			BuildTemplate(ViewsPath)
 			BuildTemplate(ViewsPath)
@@ -146,7 +152,7 @@ func (c *Controller) RenderBytes() ([]byte, error) {
 		return icontent, nil
 		return icontent, nil
 	} else {
 	} else {
 		if c.TplNames == "" {
 		if c.TplNames == "" {
-			c.TplNames = c.ChildName + "/" + strings.ToLower(c.Ctx.Request.Method) + "." + c.TplExt
+			c.TplNames = strings.ToLower(c.controllerName) + "/" + strings.ToLower(c.actionName) + "." + c.TplExt
 		}
 		}
 		if RunMode == "dev" {
 		if RunMode == "dev" {
 			BuildTemplate(ViewsPath)
 			BuildTemplate(ViewsPath)
@@ -181,7 +187,7 @@ func (c *Controller) Abort(code string) {
 }
 }
 
 
 func (c *Controller) StopRun() {
 func (c *Controller) StopRun() {
-	panic("")
+	panic(USERSTOPRUN)
 }
 }
 
 
 func (c *Controller) UrlFor(endpoint string, values ...string) string {
 func (c *Controller) UrlFor(endpoint string, values ...string) string {