[gen] Allow to display, in history, differences between successive versions of XHTML fields via appy.shared.diff.HtmlDiff (which was not integrated to appy.gen until now). Improved rendering of XHTML fields. [pod] bugfix while generating filenames for files included into pod results.
This commit is contained in:
parent
6c832e43bb
commit
240ce59519
8 changed files with 94 additions and 20 deletions
|
@ -95,7 +95,7 @@ class DocImporter:
|
|||
format = '' # We will know it only after the HTTP GET.
|
||||
else:
|
||||
format = os.path.splitext(at)[1][1:]
|
||||
fileName = 'f.%d.%f.%s' % (random.randint(0,10), time.time(), format)
|
||||
fileName = 'f.%d.%f.%s' % (random.randint(0,1000), time.time(), format)
|
||||
return os.path.abspath('%s/%s' % (self.importFolder, fileName))
|
||||
|
||||
def moveFile(self, at, importPath):
|
||||
|
@ -288,7 +288,7 @@ class ImageImporter(DocImporter):
|
|||
t = self.textNs
|
||||
x = self.linkNs
|
||||
s = self.svgNs
|
||||
imageName = 'Image%f' % time.time()
|
||||
imageName = 'Image%f.%d' % (time.time(), random.randint(0,1000))
|
||||
# Compute path to image
|
||||
i = self.importPath.rfind(self.pictFolder)
|
||||
imagePath = self.importPath[i+1:].replace('\\', '/')
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue