Reinstate inadvertent removal of rev 19988 change for bug 5900
svn: r21327
This commit is contained in:
parent
c56bd35ce0
commit
539fed3314
@ -187,7 +187,10 @@ class DocReportDialog(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)
|
||||||
|
|
||||||
|
@ -168,7 +168,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)
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user