Mirrors/kararas_iris
1
0
Fork 0
mirror of https://github.com/kataras/iris.git synced 2025-12-18 18:37:05 +00:00
Code Releases Activity

🐵 prepare next version: improve the hero and mvc path parameters bindings

Browse Source 
Former-commit-id: 0626b91c6448b5cebf1d04ee3f115cde68aa3d6d
This commit is contained in:
Gerasimos (Makis) Maropoulos
2020-03-02 19:48:53 +02:00
parent 78ab341862
commit bb66c10ad3
9 changed files with 122 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
mvc/controller.go
View File

@@ -8,6 +8,7 @@ import (
"github.com/kataras/iris/v12/context"
"github.com/kataras/iris/v12/core/router"
"github.com/kataras/iris/v12/hero"
"github.com/kataras/iris/v12/macro"
)
// BaseController is the optional controller interface, if it's
@@ -226,7 +227,8 @@ func (c *ControllerActivator) isReservedMethod(name string) bool {
func (c *ControllerActivator) attachInjector() {
if c.injector == nil {
c.injector = c.app.container.Struct(c.Value)
partyCountParams := macro.CountParams(c.app.Router.GetRelPath(), *c.app.Router.Macros())
c.injector = c.app.container.Struct(c.Value, partyCountParams)
}
}
@@ -303,7 +305,7 @@ func (c *ControllerActivator) handleMany(method, path, funcName string, override
return nil
}
handler := c.handlerOf(funcName)
handler := c.handlerOf(path, funcName)
// register the handler now.
routes := c.app.Router.HandleMany(method, path, append(middleware, handler)...)
@@ -332,10 +334,12 @@ func (c *ControllerActivator) handleMany(method, path, funcName string, override
return routes
}
func (c *ControllerActivator) handlerOf(methodName string) context.Handler {
func (c *ControllerActivator) handlerOf(relPath, methodName string) context.Handler {
c.attachInjector()
handler := c.injector.MethodHandler(methodName)
fullpath := c.app.Router.GetRelPath() + relPath
paramsCount := macro.CountParams(fullpath, *c.app.Router.Macros())
handler := c.injector.MethodHandler(methodName, paramsCount)
if isBaseController(c.Type) {
return func(ctx context.Context) {