From cfa78119514ba1d40a6b0fa9162ac134bff1aace Mon Sep 17 00:00:00 2001 From: Charles Haley Date: Fri, 18 Apr 2014 10:51:29 +0200 Subject: [PATCH] Fix the template editor to grab an empty custom column dictionary so that it can validate use of custom column lookup names. --- src/calibre/gui2/dialogs/template_dialog.py | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/calibre/gui2/dialogs/template_dialog.py b/src/calibre/gui2/dialogs/template_dialog.py index dfd51cb5d9..5a43c3481a 100644 --- a/src/calibre/gui2/dialogs/template_dialog.py +++ b/src/calibre/gui2/dialogs/template_dialog.py @@ -266,6 +266,14 @@ class TemplateDialog(QDialog, Ui_TemplateDialog): self.mi.languages = ['eng'] if fm is not None: self.mi.set_all_user_metadata(fm.custom_field_metadata()) + else: + # No field metadata. Grab a copy from the current library so + # that we can validate any custom column names. The values for + # the columns will all be empty, which in some very unusual + # cases might cause formatter errors. We can live with that. + from calibre.gui2.ui import get_gui + self.mi.set_all_user_metadata( + get_gui().current_db.new_api.field_metadata.custom_field_metadata()) # Remove help icon on title bar icon = self.windowIcon()