Cutlery/calibre
1
0
Fork 0
mirror of https://github.com/kovidgoyal/calibre.git synced 2025-07-08 02:34:06 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix regression in 0.7.46 that broke creating date and composite custom columns

Browse Source
This commit is contained in:
Kovid Goyal 2011-02-19 17:08:12 -07:00
parent 9adc087ad5
commit f6665bc5c8
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/calibre/gui2/preferences/create_custom_column.py
View File

@ -153,17 +153,17 @@ class CreateCustomColumn(QDialog, Ui_QCreateCustomColumn):
display_dict = {} display_dict = {}
if col_type == 'datetime': if col_type == 'datetime':
if self.date_format_box.text().strip(): if unicode(self.date_format_box.text()).strip():
display_dict = {'date_format':unicode(self.date_format_box.text()).strip()} display_dict = {'date_format':unicode(self.date_format_box.text()).strip()}
else: else:
display_dict = {'date_format': None} display_dict = {'date_format': None}
elif col_type == 'composite': elif col_type == 'composite':
if not self.composite_box.text().strip(): if not unicode(self.composite_box.text()).strip():
return self.simple_error('', _('You must enter a template for' return self.simple_error('', _('You must enter a template for'
' composite columns')) ' composite columns'))
display_dict = {'composite_template':unicode(self.composite_box.text()).strip()} display_dict = {'composite_template':unicode(self.composite_box.text()).strip()}
elif col_type == 'enumeration': elif col_type == 'enumeration':
if not self.enum_box.text(): if not unicode(self.enum_box.text()).strip():
return self.simple_error('', _('You must enter at least one' return self.simple_error('', _('You must enter at least one'
' value for enumeration columns')) ' value for enumeration columns'))
l = [v.strip() for v in unicode(self.enum_box.text()).split(',')] l = [v.strip() for v in unicode(self.enum_box.text()).split(',')]