This commit is contained in:
Charles Haley 2011-03-22 14:12:08 +00:00
parent 794cb48fbd
commit dd8e2651b9
2 changed files with 4 additions and 3 deletions

View File

@ -433,7 +433,7 @@ class BooksView(QTableView): # {{{
self.setItemDelegateForColumn(cm.index(colhead), delegate) self.setItemDelegateForColumn(cm.index(colhead), delegate)
elif cc['datatype'] == 'comments': elif cc['datatype'] == 'comments':
self.setItemDelegateForColumn(cm.index(colhead), self.cc_comments_delegate) self.setItemDelegateForColumn(cm.index(colhead), self.cc_comments_delegate)
elif cc['datatype'] in 'text': elif cc['datatype'] == 'text':
if cc['is_multiple']: if cc['is_multiple']:
if cc['display'].get('is_names', False): if cc['display'].get('is_names', False):
self.setItemDelegateForColumn(cm.index(colhead), self.setItemDelegateForColumn(cm.index(colhead),

View File

@ -696,8 +696,9 @@ class BrowseServer(object):
xml(val if len(dbtags) == 1 else tag.name), xml(val if len(dbtags) == 1 else tag.name),
xml(key, True))) xml(key, True)))
join = ' & ' if key == 'authors' or \ join = ' & ' if key == 'authors' or \
fm['display'].get('is_names', False) \ (fm['is_custom'] and
else ', ' fm['display'].get('is_names', False)) \
else ', '
args[key] = join.join(vals) args[key] = join.join(vals)
added_key = True added_key = True
if not added_key: if not added_key: