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
d3f3956d
Commit
d3f3956d
authored
Apr 19, 2017
by
astaxie
Committed by
GitHub
Apr 19, 2017
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #2574 from extrlibs/master
Fix the following template reference
parents
72062141
0cd31a24
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
1 deletion
+4
-1
template.go
template.go
+4
-1
No files found.
template.go
View file @
d3f3956d
...
...
@@ -230,9 +230,12 @@ func BuildTemplate(dir string, files ...string) error {
func
getTplDeep
(
root
,
file
,
parent
string
,
t
*
template
.
Template
)
(
*
template
.
Template
,
[][]
string
,
error
)
{
var
fileAbsPath
string
var
rParent
string
if
filepath
.
HasPrefix
(
file
,
"../"
)
{
rParent
=
filepath
.
Join
(
filepath
.
Dir
(
parent
),
file
)
fileAbsPath
=
filepath
.
Join
(
root
,
filepath
.
Dir
(
parent
),
file
)
}
else
{
rParent
=
file
fileAbsPath
=
filepath
.
Join
(
root
,
file
)
}
if
e
:=
utils
.
FileExists
(
fileAbsPath
);
!
e
{
...
...
@@ -257,7 +260,7 @@ func getTplDeep(root, file, parent string, t *template.Template) (*template.Temp
if
!
HasTemplateExt
(
m
[
1
])
{
continue
}
_
,
_
,
err
=
getTplDeep
(
root
,
m
[
1
],
file
,
t
)
_
,
_
,
err
=
getTplDeep
(
root
,
m
[
1
],
rParent
,
t
)
if
err
!=
nil
{
return
nil
,
[][]
string
{},
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