Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in
Toggle navigation
B
beego
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
go
beego
Commits
e619d839
Commit
e619d839
authored
Jun 13, 2015
by
astaxie
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix the filter router issues
parent
27b452cd
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
9 additions
and
7 deletions
+9
-7
router.go
router.go
+6
-4
router_test.go
router_test.go
+3
-3
No files found.
router.go
View file @
e619d839
...
...
@@ -611,19 +611,21 @@ func (p *ControllerRegistor) ServeHTTP(rw http.ResponseWriter, r *http.Request)
if
p
.
enableFilter
{
if
l
,
ok
:=
p
.
filters
[
pos
];
ok
{
for
_
,
filterR
:=
range
l
{
if
ok
,
p
:=
filterR
.
ValidRouter
(
urlPath
);
ok
{
for
k
,
v
:=
range
p
{
if
filterR
.
returnOnOutput
&&
w
.
started
{
return
true
}
if
ok
,
params
:=
filterR
.
ValidRouter
(
urlPath
);
ok
{
for
k
,
v
:=
range
params
{
context
.
Input
.
Params
[
k
]
=
v
}
filterR
.
filterFunc
(
context
)
}
if
filterR
.
returnOnOutput
&&
w
.
started
{
return
true
}
}
}
}
}
return
false
}
...
...
router_test.go
View file @
e619d839
...
...
@@ -444,7 +444,7 @@ func TestFilterAfterExec(t *testing.T) {
mux
:=
NewControllerRegister
()
mux
.
InsertFilter
(
url
,
BeforeRouter
,
beegoFilterNoOutput
)
mux
.
InsertFilter
(
url
,
BeforeExec
,
beegoFilterNoOutput
)
mux
.
InsertFilter
(
url
,
AfterExec
,
beegoAfterExec1
)
mux
.
InsertFilter
(
url
,
AfterExec
,
beegoAfterExec1
,
false
)
mux
.
Get
(
url
,
beegoFilterFunc
)
...
...
@@ -506,7 +506,7 @@ func TestFilterFinishRouterMultiFirstOnly(t *testing.T) {
url
:=
"/finishRouterMultiFirstOnly"
mux
:=
NewControllerRegister
()
mux
.
InsertFilter
(
url
,
FinishRouter
,
beegoFinishRouter1
)
mux
.
InsertFilter
(
url
,
FinishRouter
,
beegoFinishRouter1
,
false
)
mux
.
InsertFilter
(
url
,
FinishRouter
,
beegoFinishRouter2
)
mux
.
Get
(
url
,
beegoFilterFunc
)
...
...
@@ -534,7 +534,7 @@ func TestFilterFinishRouterMulti(t *testing.T) {
mux
:=
NewControllerRegister
()
mux
.
InsertFilter
(
url
,
FinishRouter
,
beegoFinishRouter1
,
false
)
mux
.
InsertFilter
(
url
,
FinishRouter
,
beegoFinishRouter2
)
mux
.
InsertFilter
(
url
,
FinishRouter
,
beegoFinishRouter2
,
false
)
mux
.
Get
(
url
,
beegoFilterFunc
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment