mirror of
https://github.com/kovidgoyal/calibre.git
synced 2025-07-07 18:24:30 -04:00
Merge branch 'bookdetail-multiline-path' of https://github.com/un-pogaz/calibre
This commit is contained in:
commit
0625df37d1
@ -225,12 +225,13 @@ def mi_to_html(
|
||||
break
|
||||
text = _('Book files')
|
||||
name = ngettext('Folder:', 'Folders:', num_of_folders)
|
||||
link = '<a href="{}" title="{}">{}</a>{}'.format(action(scheme, book_id=book_id, loc=loc),
|
||||
prepare_string_for_xml(path, True), text, extra)
|
||||
links = ['<a href="{}" title="{}">{}</a>{}'.format(action(scheme, book_id=book_id, loc=loc),
|
||||
prepare_string_for_xml(path, True), text, extra)]
|
||||
if num_of_folders > 1:
|
||||
link += ', <a href="{}" title="{}">{}</a>'.format(
|
||||
links.append('<a href="{}" title="{}">{}</a>'.format(
|
||||
action('data-path', book_id=book_id, loc=book_id),
|
||||
prepare_string_for_xml(data_path, True), _('Data files'))
|
||||
prepare_string_for_xml(data_path, True), _('Data files')))
|
||||
link = value_list(', ', links)
|
||||
|
||||
else:
|
||||
link = prepare_string_for_xml(path, True)
|
||||
|
@ -483,7 +483,9 @@ class BDVerticalCats(DisplayedFields): # {{{
|
||||
|
||||
def initialize(self, use_defaults=False, pref_data_override=None):
|
||||
fm = self.db.field_metadata
|
||||
cats = [k for k in fm if fm[k]['name'] and fm[k]['is_multiple']]
|
||||
cats = [k for k in fm if fm[k]['name'] and fm[k]['is_multiple'] and not k.startswith('#')]
|
||||
cats.append('path')
|
||||
cats.extend([k for k in fm if fm[k]['name'] and fm[k]['is_multiple'] and k.startswith('#')])
|
||||
ans = []
|
||||
if use_defaults:
|
||||
ans = [[k, False] for k in cats]
|
||||
|
Loading…
x
Reference in New Issue
Block a user