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

0005018: CLI report claims to ignore pre-existing "note" option (Patch from Paul Franklin)

Browse Source 
svn: r17806
This commit is contained in:
Brian Matherly 2011-06-19 02:46:33 +00:00
parent 392df6ad2b
commit 72adcddf9d
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/cli/plug/__init__.py
View File

@ -6,6 +6,7 @@
# Copyright (C) 2008 Raphael Ackermann # Copyright (C) 2008 Raphael Ackermann
# Copyright (C) 2008-2011 Brian G. Matherly # Copyright (C) 2008-2011 Brian G. Matherly
# Copyright (C) 2010 Jakim Friant # Copyright (C) 2010 Jakim Friant
# Copyright (C) 2011 Paul Franklin
# #
# This program is free software; you can redistribute it and/or modify # This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by # it under the terms of the GNU General Public License as published by
@ -224,7 +225,12 @@ class CommandLineReport(object):
if category == CATEGORY_GRAPHVIZ: if category == CATEGORY_GRAPHVIZ:
# Need to include GraphViz options # Need to include GraphViz options
self.__gvoptions = graphdoc.GVOptions() self.__gvoptions = graphdoc.GVOptions()
self.__gvoptions.add_menu_options(self.option_class.menu) menu = self.option_class.menu
self.__gvoptions.add_menu_options(menu)
for name in menu.get_all_option_names():
if name not in self.option_class.options_dict:
self.option_class.options_dict[name] = \
menu.get_option_by_name(name).get_value()
self.option_class.load_previous_values() self.option_class.load_previous_values()
_validate_options(self.option_class, database) _validate_options(self.option_class, database)
self.show = options_str_dict.pop('show', None) self.show = options_str_dict.pop('show', None)