From aa7e0b49e4d5888cf505d15f5def987132832380 Mon Sep 17 00:00:00 2001 From: Tim G L Lyons Date: Wed, 13 Feb 2013 11:08:52 +0000 Subject: [PATCH] Reinstate inadvertent removal of rev 19988 change for bug 5900 svn: r21347 --- gramps/gui/plug/report/_docreportdialog.py | 4 ++++ gramps/gui/plug/report/_graphvizreportdialog.py | 5 ++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/gramps/gui/plug/report/_docreportdialog.py b/gramps/gui/plug/report/_docreportdialog.py index 59bd1c562..3ee5137a6 100644 --- a/gramps/gui/plug/report/_docreportdialog.py +++ b/gramps/gui/plug/report/_docreportdialog.py @@ -187,6 +187,10 @@ class DocReportDialog(ReportDialog): default_name = self.dbname + "_" + \ "".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)) self.target_fileentry.set_filename(spath) diff --git a/gramps/gui/plug/report/_graphvizreportdialog.py b/gramps/gui/plug/report/_graphvizreportdialog.py index 7a3e9273d..3beb28330 100644 --- a/gramps/gui/plug/report/_graphvizreportdialog.py +++ b/gramps/gui/plug/report/_graphvizreportdialog.py @@ -167,7 +167,10 @@ class GraphvizReportDialog(ReportDialog): spath = self.get_default_directory() default_name = self.dbname + "_" + \ "".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)) self.target_fileentry.set_filename(spath)