revert to the old report name
svn: r21429
This commit is contained in:
parent
4decf95b07
commit
0b30e204bf
@ -185,8 +185,7 @@ class DocReportDialog(ReportDialog):
|
|||||||
ext = ""
|
ext = ""
|
||||||
else:
|
else:
|
||||||
spath = self.get_default_directory()
|
spath = self.get_default_directory()
|
||||||
default_name = self.dbname + "_" + \
|
default_name = self.dbname + "_" + self.raw_name
|
||||||
"".join(x[0].upper() for x in self.raw_name.split("_"))
|
|
||||||
if self.options.get_output():
|
if self.options.get_output():
|
||||||
base = os.path.basename(self.options.get_output())
|
base = os.path.basename(self.options.get_output())
|
||||||
else:
|
else:
|
||||||
|
@ -166,12 +166,11 @@ class GraphvizReportDialog(ReportDialog):
|
|||||||
ext = ""
|
ext = ""
|
||||||
else:
|
else:
|
||||||
spath = self.get_default_directory()
|
spath = self.get_default_directory()
|
||||||
default_name = self.dbname + "_" + \
|
default_name = self.dbname + "_" + self.raw_name
|
||||||
"".join(x[0].upper() for x in self.raw_name.split("_"))
|
|
||||||
if self.options.get_output():
|
if self.options.get_output():
|
||||||
base = os.path.basename(self.options.get_output())
|
base = os.path.basename(self.options.get_output())
|
||||||
else:
|
else:
|
||||||
base = "%s%s" % (default_name, ext)
|
base = "%s%s" % (default_name, ext) # "ext" already has a dot
|
||||||
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