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

Clear old custom name formats when database loaded

Browse Source
This commit is contained in:
Nick Hall
2017-12-22 18:31:25 +00:00
parent 89592545f3
commit a216441029
2 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
gramps/cli/grampscli.py
View File

@ -318,6 +318,7 @@ class CLIManager:
and self.dbstate.db.get_total() == 0): and self.dbstate.db.get_total() == 0):
self.dbstate.db.set_researcher(owner) self.dbstate.db.set_researcher(owner)
name_displayer.clear_custom_formats()
name_displayer.set_name_format(self.dbstate.db.name_formats) name_displayer.set_name_format(self.dbstate.db.name_formats)
fmt_default = config.get('preferences.name-format') fmt_default = config.get('preferences.name-format')
name_displayer.set_default_format(fmt_default) name_displayer.set_default_format(fmt_default)

5
gramps/gen/display/name.py
View File

@ -418,6 +418,11 @@ class NameDisplay:
result = raw_data[_FIRSTNAME] result = raw_data[_FIRSTNAME]
return ' '.join(result.split()) return ' '.join(result.split())
def clear_custom_formats(self):
self.name_formats = {num: value
for num, value in self.name_formats.items()
if num >= 0}
def set_name_format(self, formats): def set_name_format(self, formats):
raw_func_dict = { raw_func_dict = {