Add the enumeration type to fields merged when merging books.

This commit is contained in:
Charles Haley 2012-10-05 08:00:02 +02:00
parent 16472e86b1
commit 91b8ec6e87

View File

@ -459,9 +459,10 @@ class EditMetadataAction(InterfaceAction):
if src_value: if src_value:
src_index = db.get_custom_extra(src_id, num=colnum, index_is_id=True) src_index = db.get_custom_extra(src_id, num=colnum, index_is_id=True)
db.set_custom(dest_id, src_value, num=colnum, extra=src_index) db.set_custom(dest_id, src_value, num=colnum, extra=src_index)
if db.field_metadata[key]['datatype'] == 'text' \ if (db.field_metadata[key]['datatype'] == 'enumeration' or
and not db.field_metadata[key]['is_multiple'] \ (db.field_metadata[key]['datatype'] == 'text' and
and not dest_value: not db.field_metadata[key]['is_multiple'])
and not dest_value):
db.set_custom(dest_id, src_value, num=colnum) db.set_custom(dest_id, src_value, num=colnum)
if db.field_metadata[key]['datatype'] == 'text' \ if db.field_metadata[key]['datatype'] == 'text' \
and db.field_metadata[key]['is_multiple']: and db.field_metadata[key]['is_multiple']: