revert to the old report name

svn: r21429
This commit is contained in:
Paul Franklin 2013-02-24 08:40:08 +00:00
parent 4decf95b07
commit 0b30e204bf
2 changed files with 3 additions and 5 deletions

View File

@ -185,8 +185,7 @@ class DocReportDialog(ReportDialog):
ext = ""
else:
spath = self.get_default_directory()
default_name = self.dbname + "_" + \
"".join(x[0].upper() for x in self.raw_name.split("_"))
default_name = self.dbname + "_" + self.raw_name
if self.options.get_output():
base = os.path.basename(self.options.get_output())
else:

View File

@ -166,12 +166,11 @@ class GraphvizReportDialog(ReportDialog):
ext = ""
else:
spath = self.get_default_directory()
default_name = self.dbname + "_" + \
"".join(x[0].upper() for x in self.raw_name.split("_"))
default_name = self.dbname + "_" + self.raw_name
if self.options.get_output():
base = os.path.basename(self.options.get_output())
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))
self.target_fileentry.set_filename(spath)