Cyclone-Team/gramps
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Reinstate inadvertent removal of rev 19988 change for bug 5900

Browse Source 
svn: r21347
This commit is contained in:
Tim G L Lyons 2013-02-13 11:08:52 +00:00
parent 3c103143a6
commit aa7e0b49e4
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gramps/gui/plug/report/_docreportdialog.py
View File

@ -187,6 +187,10 @@ class DocReportDialog(ReportDialog):
default_name = self.dbname + "_" + \ default_name = self.dbname + "_" + \
"".join(x[0].upper() for x in self.raw_name.split("_")) "".join(x[0].upper() for x in self.raw_name.split("_"))
base = "%s.%s" % (default_name, ext) base = "%s.%s" % (default_name, ext)
if self.options.get_output():
base = os.path.basename(self.options.get_output())
else:
base = "%s.%s" % (default_name, ext)
spath = os.path.normpath(os.path.join(spath, base)) spath = os.path.normpath(os.path.join(spath, base))
self.target_fileentry.set_filename(spath) self.target_fileentry.set_filename(spath)

5
gramps/gui/plug/report/_graphvizreportdialog.py
View File

@ -167,7 +167,10 @@ class GraphvizReportDialog(ReportDialog):
spath = self.get_default_directory() spath = self.get_default_directory()
default_name = self.dbname + "_" + \ default_name = self.dbname + "_" + \
"".join(x[0].upper() for x in self.raw_name.split("_")) "".join(x[0].upper() for x in self.raw_name.split("_"))
base = "%s%s" % (default_name, ext) if self.options.get_output():
base = os.path.basename(self.options.get_output())
else:
base = "%s.%s" % (default_name, ext)
spath = os.path.normpath(os.path.join(spath, base)) spath = os.path.normpath(os.path.join(spath, base))
self.target_fileentry.set_filename(spath) self.target_fileentry.set_filename(spath)