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

Better fix for duplicate key problem

Browse Source
This commit is contained in:
Charles Haley 2011-03-03 18:19:22 +00:00
parent 9fe80ab4a6
commit 26b0d3b907
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -182,11 +182,12 @@ class CreateCustomColumn(QDialog, Ui_QCreateCustomColumn):
if not col_heading: if not col_heading:
return self.simple_error('', _('No column heading was provided')) return self.simple_error('', _('No column heading was provided'))
db = self.parent.gui.library_view.model().db
key = db.field_metadata.custom_field_prefix+col
bad_col = False bad_col = False
colkey = '#' + col if key in self.parent.custcols:
if colkey in self.parent.custcols:
if not self.editing_col or \ if not self.editing_col or \
self.parent.custcols[colkey]['colnum'] != self.orig_column_number: self.parent.custcols[key]['colnum'] != self.orig_column_number:
bad_col = True bad_col = True
if bad_col: if bad_col:
return self.simple_error('', _('The lookup name %s is already used')%col) return self.simple_error('', _('The lookup name %s is already used')%col)
@ -232,8 +233,6 @@ class CreateCustomColumn(QDialog, Ui_QCreateCustomColumn):
'list more than once').format(l[i])) 'list more than once').format(l[i]))
display_dict = {'enum_values': l} display_dict = {'enum_values': l}
db = self.parent.gui.library_view.model().db
key = db.field_metadata.custom_field_prefix+col
if not self.editing_col: if not self.editing_col:
db.field_metadata db.field_metadata
self.parent.custcols[key] = { self.parent.custcols[key] = {