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
dfa74faf
Commit
dfa74faf
authored
Feb 07, 2017
by
Eyal Post
Committed by
Eyal Post
Feb 07, 2017
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
support for multiple view paths
parent
2a660820
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
109 additions
and
19 deletions
+109
-19
controller.go
controller.go
+12
-4
controller_test.go
controller_test.go
+58
-0
hooks.go
hooks.go
+1
-1
template.go
template.go
+29
-13
template_test.go
template_test.go
+9
-1
No files found.
controller.go
View file @
dfa74faf
...
@@ -69,6 +69,7 @@ type Controller struct {
...
@@ -69,6 +69,7 @@ type Controller struct {
// template data
// template data
TplName
string
TplName
string
ViewPath
string
Layout
string
Layout
string
LayoutSections
map
[
string
]
string
// the key is the section name and the value is the template name
LayoutSections
map
[
string
]
string
// the key is the section name and the value is the template name
TplPrefix
string
TplPrefix
string
...
@@ -213,7 +214,7 @@ func (c *Controller) RenderBytes() ([]byte, error) {
...
@@ -213,7 +214,7 @@ func (c *Controller) RenderBytes() ([]byte, error) {
continue
continue
}
}
buf
.
Reset
()
buf
.
Reset
()
err
=
Execute
Template
(
&
buf
,
sectionTpl
,
c
.
Data
)
err
=
Execute
ViewPathTemplate
(
&
buf
,
sectionTpl
,
c
.
viewPath
()
,
c
.
Data
)
if
err
!=
nil
{
if
err
!=
nil
{
return
nil
,
err
return
nil
,
err
}
}
...
@@ -222,7 +223,7 @@ func (c *Controller) RenderBytes() ([]byte, error) {
...
@@ -222,7 +223,7 @@ func (c *Controller) RenderBytes() ([]byte, error) {
}
}
buf
.
Reset
()
buf
.
Reset
()
Execute
Template
(
&
buf
,
c
.
Layout
,
c
.
Data
)
Execute
ViewPathTemplate
(
&
buf
,
c
.
Layout
,
c
.
viewPath
()
,
c
.
Data
)
}
}
return
buf
.
Bytes
(),
err
return
buf
.
Bytes
(),
err
}
}
...
@@ -248,9 +249,16 @@ func (c *Controller) renderTemplate() (bytes.Buffer, error) {
...
@@ -248,9 +249,16 @@ func (c *Controller) renderTemplate() (bytes.Buffer, error) {
}
}
}
}
}
}
BuildTemplate
(
BConfig
.
WebConfig
.
ViewsPath
,
buildFiles
...
)
BuildTemplate
(
c
.
viewPath
()
,
buildFiles
...
)
}
}
return
buf
,
ExecuteTemplate
(
&
buf
,
c
.
TplName
,
c
.
Data
)
return
buf
,
ExecuteViewPathTemplate
(
&
buf
,
c
.
TplName
,
c
.
viewPath
(),
c
.
Data
)
}
func
(
c
*
Controller
)
viewPath
()
string
{
if
c
.
ViewPath
==
""
{
return
BConfig
.
WebConfig
.
ViewsPath
}
return
c
.
ViewPath
}
}
// Redirect sends the redirection response to url with status code.
// Redirect sends the redirection response to url with status code.
...
...
controller_test.go
View file @
dfa74faf
...
@@ -20,6 +20,8 @@ import (
...
@@ -20,6 +20,8 @@ import (
"testing"
"testing"
"github.com/astaxie/beego/context"
"github.com/astaxie/beego/context"
"os"
"path/filepath"
)
)
func
TestGetInt
(
t
*
testing
.
T
)
{
func
TestGetInt
(
t
*
testing
.
T
)
{
...
@@ -121,3 +123,59 @@ func TestGetUint64(t *testing.T) {
...
@@ -121,3 +123,59 @@ func TestGetUint64(t *testing.T) {
t
.
Errorf
(
"TestGetUint64 expect %v,get %T,%v"
,
uint64
(
math
.
MaxUint64
),
val
,
val
)
t
.
Errorf
(
"TestGetUint64 expect %v,get %T,%v"
,
uint64
(
math
.
MaxUint64
),
val
,
val
)
}
}
}
}
func
TestAdditionalViewPaths
(
t
*
testing
.
T
)
{
dir1
:=
"_beeTmp"
dir2
:=
"_beeTmp2"
defer
os
.
RemoveAll
(
dir1
)
defer
os
.
RemoveAll
(
dir2
)
dir1file
:=
"file1.tpl"
dir2file
:=
"file2.tpl"
genFile
:=
func
(
dir
string
,
name
string
,
content
string
)
{
os
.
MkdirAll
(
filepath
.
Dir
(
filepath
.
Join
(
dir
,
name
)),
0777
)
if
f
,
err
:=
os
.
Create
(
filepath
.
Join
(
dir
,
name
));
err
!=
nil
{
t
.
Fatal
(
err
)
}
else
{
defer
f
.
Close
()
f
.
WriteString
(
content
)
f
.
Close
()
}
}
genFile
(
dir1
,
dir1file
,
`<div>{{.Content}}</div>`
)
genFile
(
dir2
,
dir2file
,
`<html>{{.Content}}</html>`
)
AddViewPath
(
dir1
)
AddViewPath
(
dir2
)
ctrl
:=
Controller
{
TplName
:
"file1.tpl"
,
ViewPath
:
dir1
,
}
ctrl
.
Data
=
map
[
interface
{}]
interface
{}{
"Content"
:
"value2"
,
}
if
result
,
err
:=
ctrl
.
RenderString
();
err
!=
nil
{
t
.
Fatal
(
err
)
}
else
{
if
result
!=
"<div>value2</div>"
{
t
.
Fatalf
(
"TestAdditionalViewPaths expect %s got %s"
,
"<div>value2</div>"
,
result
)
}
}
func
()
{
ctrl
.
TplName
=
"file2.tpl"
defer
func
()
{
if
r
:=
recover
();
r
==
nil
{
t
.
Fatal
(
"TestAdditionalViewPaths expected error"
)
}
}()
ctrl
.
RenderString
();
}()
ctrl
.
TplName
=
"file2.tpl"
ctrl
.
ViewPath
=
dir2
ctrl
.
RenderString
();
}
hooks.go
View file @
dfa74faf
...
@@ -72,7 +72,7 @@ func registerSession() error {
...
@@ -72,7 +72,7 @@ func registerSession() error {
}
}
func
registerTemplate
()
error
{
func
registerTemplate
()
error
{
if
err
:=
BuildTemplate
(
BConfig
.
WebConfig
.
ViewsPath
);
err
!=
nil
{
if
err
:=
AddViewPath
(
BConfig
.
WebConfig
.
ViewsPath
);
err
!=
nil
{
if
BConfig
.
RunMode
==
DEV
{
if
BConfig
.
RunMode
==
DEV
{
logs
.
Warn
(
err
)
logs
.
Warn
(
err
)
}
}
...
...
template.go
View file @
dfa74faf
...
@@ -32,8 +32,8 @@ import (
...
@@ -32,8 +32,8 @@ import (
var
(
var
(
beegoTplFuncMap
=
make
(
template
.
FuncMap
)
beegoTplFuncMap
=
make
(
template
.
FuncMap
)
// beeTemplates caching map and supported template file extensions.
// bee
ViewPath
Templates caching map and supported template file extensions.
bee
Templates
=
make
(
map
[
string
]
*
template
.
Template
)
bee
ViewPathTemplates
=
make
(
map
[
string
]
map
[
string
]
*
template
.
Template
)
templatesLock
sync
.
RWMutex
templatesLock
sync
.
RWMutex
// beeTemplateExt stores the template extension which will build
// beeTemplateExt stores the template extension which will build
beeTemplateExt
=
[]
string
{
"tpl"
,
"html"
}
beeTemplateExt
=
[]
string
{
"tpl"
,
"html"
}
...
@@ -45,23 +45,30 @@ var (
...
@@ -45,23 +45,30 @@ var (
// writing the output to wr.
// writing the output to wr.
// A template will be executed safely in parallel.
// A template will be executed safely in parallel.
func
ExecuteTemplate
(
wr
io
.
Writer
,
name
string
,
data
interface
{})
error
{
func
ExecuteTemplate
(
wr
io
.
Writer
,
name
string
,
data
interface
{})
error
{
return
ExecuteViewPathTemplate
(
wr
,
name
,
BConfig
.
WebConfig
.
ViewsPath
,
data
)
}
func
ExecuteViewPathTemplate
(
wr
io
.
Writer
,
name
string
,
viewPath
string
,
data
interface
{})
error
{
if
BConfig
.
RunMode
==
DEV
{
if
BConfig
.
RunMode
==
DEV
{
templatesLock
.
RLock
()
templatesLock
.
RLock
()
defer
templatesLock
.
RUnlock
()
defer
templatesLock
.
RUnlock
()
}
}
if
t
,
ok
:=
beeTemplates
[
name
];
ok
{
if
beeTemplates
,
ok
:=
beeViewPathTemplates
[
viewPath
];
ok
{
var
err
error
if
t
,
ok
:=
beeTemplates
[
name
];
ok
{
if
t
.
Lookup
(
name
)
!=
nil
{
var
err
error
err
=
t
.
ExecuteTemplate
(
wr
,
name
,
data
)
if
t
.
Lookup
(
name
)
!=
nil
{
}
else
{
err
=
t
.
ExecuteTemplate
(
wr
,
name
,
data
)
err
=
t
.
Execute
(
wr
,
data
)
}
else
{
}
err
=
t
.
Execute
(
wr
,
data
)
if
err
!=
nil
{
}
logs
.
Trace
(
"template Execute err:"
,
err
)
if
err
!=
nil
{
logs
.
Trace
(
"template Execute err:"
,
err
)
}
return
err
}
}
return
err
panic
(
"can't find templatefile in the path:"
+
viewPath
+
"/"
+
name
)
}
}
panic
(
"
can't find templatefile in the path:"
+
name
)
panic
(
"
Uknown view path:"
+
viewPath
)
}
}
func
init
()
{
func
init
()
{
...
@@ -149,6 +156,11 @@ func AddTemplateExt(ext string) {
...
@@ -149,6 +156,11 @@ func AddTemplateExt(ext string) {
beeTemplateExt
=
append
(
beeTemplateExt
,
ext
)
beeTemplateExt
=
append
(
beeTemplateExt
,
ext
)
}
}
func
AddViewPath
(
viewPath
string
)
error
{
beeViewPathTemplates
[
viewPath
]
=
make
(
map
[
string
]
*
template
.
Template
)
return
BuildTemplate
(
viewPath
)
}
// BuildTemplate will build all template files in a directory.
// BuildTemplate will build all template files in a directory.
// it makes beego can render any template file in view directory.
// it makes beego can render any template file in view directory.
func
BuildTemplate
(
dir
string
,
files
...
string
)
error
{
func
BuildTemplate
(
dir
string
,
files
...
string
)
error
{
...
@@ -158,6 +170,10 @@ func BuildTemplate(dir string, files ...string) error {
...
@@ -158,6 +170,10 @@ func BuildTemplate(dir string, files ...string) error {
}
}
return
errors
.
New
(
"dir open err"
)
return
errors
.
New
(
"dir open err"
)
}
}
beeTemplates
,
ok
:=
beeViewPathTemplates
[
dir
];
if
!
ok
{
panic
(
"Unknown view path: "
+
dir
)
}
self
:=
&
templateFile
{
self
:=
&
templateFile
{
root
:
dir
,
root
:
dir
,
files
:
make
(
map
[
string
][]
string
),
files
:
make
(
map
[
string
][]
string
),
...
...
template_test.go
View file @
dfa74faf
...
@@ -67,9 +67,10 @@ func TestTemplate(t *testing.T) {
...
@@ -67,9 +67,10 @@ func TestTemplate(t *testing.T) {
f
.
Close
()
f
.
Close
()
}
}
}
}
if
err
:=
BuildTemplate
(
dir
);
err
!=
nil
{
if
err
:=
AddViewPath
(
dir
);
err
!=
nil
{
t
.
Fatal
(
err
)
t
.
Fatal
(
err
)
}
}
beeTemplates
:=
beeViewPathTemplates
[
dir
]
if
len
(
beeTemplates
)
!=
3
{
if
len
(
beeTemplates
)
!=
3
{
t
.
Fatalf
(
"should be 3 but got %v"
,
len
(
beeTemplates
))
t
.
Fatalf
(
"should be 3 but got %v"
,
len
(
beeTemplates
))
}
}
...
@@ -103,6 +104,12 @@ var user = `<!DOCTYPE html>
...
@@ -103,6 +104,12 @@ var user = `<!DOCTYPE html>
func
TestRelativeTemplate
(
t
*
testing
.
T
)
{
func
TestRelativeTemplate
(
t
*
testing
.
T
)
{
dir
:=
"_beeTmp"
dir
:=
"_beeTmp"
//Just add dir to known viewPaths
if
err
:=
AddViewPath
(
dir
);
err
!=
nil
{
t
.
Fatal
(
err
)
}
files
:=
[]
string
{
files
:=
[]
string
{
"easyui/public/menu.tpl"
,
"easyui/public/menu.tpl"
,
"easyui/rbac/user.tpl"
,
"easyui/rbac/user.tpl"
,
...
@@ -126,6 +133,7 @@ func TestRelativeTemplate(t *testing.T) {
...
@@ -126,6 +133,7 @@ func TestRelativeTemplate(t *testing.T) {
if
err
:=
BuildTemplate
(
dir
,
files
[
1
]);
err
!=
nil
{
if
err
:=
BuildTemplate
(
dir
,
files
[
1
]);
err
!=
nil
{
t
.
Fatal
(
err
)
t
.
Fatal
(
err
)
}
}
beeTemplates
:=
beeViewPathTemplates
[
dir
]
if
err
:=
beeTemplates
[
"easyui/rbac/user.tpl"
]
.
ExecuteTemplate
(
os
.
Stdout
,
"easyui/rbac/user.tpl"
,
nil
);
err
!=
nil
{
if
err
:=
beeTemplates
[
"easyui/rbac/user.tpl"
]
.
ExecuteTemplate
(
os
.
Stdout
,
"easyui/rbac/user.tpl"
,
nil
);
err
!=
nil
{
t
.
Fatal
(
err
)
t
.
Fatal
(
err
)
}
}
...
...
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