Fix execute function in header

master3.3
Mike Hiretsky 12 years ago
parent d883f0bdfd
commit a5d24a41d7

@ -503,7 +503,7 @@ class fileHeader(_terms):
headerTerm = True
def __init__(self, templateName, text, comment=False, fileType=False,
objVar=False, function=False):
objVar=False, function=False, templateObj=None):
self.body = text
# Объект с переменными
self.objVar=objVar
@ -565,6 +565,7 @@ class fileHeader(_terms):
self.body = self.body[reL.end():]
else:
self.body = ""
paramLine = templateObj.applyFuncTemplate(paramLine,templateName)
paramList = self.splitParLine(paramLine)
if paramList:
for i in paramList:
@ -4820,7 +4821,7 @@ gettext -d cl_template "$*"
self.closeTemplFile()
objHeadNew = fileHeader(nameFileTemplate, self.textTemplate, False,
templateFileType ,objVar=self.objVar,
function=function)
function=function,templateObj=self)
# файл шаблона не будет применен
if not objHeadNew.headerTerm:
if objHeadNew.getError():

Loading…
Cancel
Save