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

revert to the old report name

Browse Source 
svn: r21428
This commit is contained in:
Paul Franklin 2013-02-24 08:39:51 +00:00
parent 123a6e0ecf
commit 4621970783
2 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -185,9 +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("_"))
base = "%s.%s" % (default_name, ext)
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:

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

@ -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)