This commit is contained in:
Kovid Goyal 2018-07-03 09:52:34 +05:30
parent 835e1cf482
commit ef10150149
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C

View File

@ -209,8 +209,7 @@ def ACQUISITION_ENTRY(book_id, updated, request_context):
xml(format_tag_string(val,
fm['is_multiple']['ui_to_list'],
joinval=fm['is_multiple']['list_to_ui']))))
elif datatype == 'comments' or (fm['datatype'] == 'composite' and
fm['display'].get('contains_html', False)):
elif datatype == 'comments' or (fm['datatype'] == 'composite' and fm['display'].get('contains_html', False)):
extra.append('%s: %s<br />'%(xml(name), comments_to_html(unicode(val))))
else:
extra.append('%s: %s<br />'%(xml(name), xml(unicode(val))))
@ -551,8 +550,7 @@ def opds_category(ctx, rd, category, which):
which = int(which[:p])
except Exception:
# Might be a composite column, where we have the lookup key
if not (category in rc.db.field_metadata and
rc.db.field_metadata[category]['datatype'] == 'composite'):
if not (category in rc.db.field_metadata and rc.db.field_metadata[category]['datatype'] == 'composite'):
raise HTTPNotFound('Tag %r not found'%which)
categories = rc.get_categories()