mirror of
https://github.com/kovidgoyal/calibre.git
synced 2025-07-31 14:33:54 -04:00
Content server: Display book title on permalink page
Fixes #1246523 [No title shown in permalink view](https://bugs.launchpad.net/calibre/+bug/1246523)
This commit is contained in:
parent
67e6a01fb2
commit
71908700d0
@ -836,7 +836,7 @@ class BrowseServer(object):
|
|||||||
raw = json.dumps('\n'.join(summs), ensure_ascii=True)
|
raw = json.dumps('\n'.join(summs), ensure_ascii=True)
|
||||||
return raw
|
return raw
|
||||||
|
|
||||||
def browse_render_details(self, id_, add_random_button=False):
|
def browse_render_details(self, id_, add_random_button=False, add_title=False):
|
||||||
try:
|
try:
|
||||||
mi = self.db.get_metadata(id_, index_is_id=True)
|
mi = self.db.get_metadata(id_, index_is_id=True)
|
||||||
except:
|
except:
|
||||||
@ -894,6 +894,8 @@ class BrowseServer(object):
|
|||||||
fields.append((m['name'], r))
|
fields.append((m['name'], r))
|
||||||
|
|
||||||
fields.sort(key=lambda x: sort_key(x[0]))
|
fields.sort(key=lambda x: sort_key(x[0]))
|
||||||
|
if add_title:
|
||||||
|
fields.insert(0, ('Title', u'<strong>%s: </strong>%s' % (xml(_('Title')), xml(mi.title))))
|
||||||
fields = [u'<div class="field">{0}</div>'.format(f[1]) for f in
|
fields = [u'<div class="field">{0}</div>'.format(f[1]) for f in
|
||||||
fields]
|
fields]
|
||||||
fields = u'<div class="fields">%s</div>'%('\n\n'.join(fields))
|
fields = u'<div class="fields">%s</div>'%('\n\n'.join(fields))
|
||||||
@ -934,7 +936,7 @@ class BrowseServer(object):
|
|||||||
book_id = random.choice(self.search_for_books(''))
|
book_id = random.choice(self.search_for_books(''))
|
||||||
except IndexError:
|
except IndexError:
|
||||||
raise cherrypy.HTTPError(404, 'This library has no books')
|
raise cherrypy.HTTPError(404, 'This library has no books')
|
||||||
ans = self.browse_render_details(book_id, add_random_button=True)
|
ans = self.browse_render_details(book_id, add_random_button=True, add_title=True)
|
||||||
return self.browse_template('').format(
|
return self.browse_template('').format(
|
||||||
title='', script='book();', main=ans)
|
title='', script='book();', main=ans)
|
||||||
|
|
||||||
@ -945,9 +947,9 @@ class BrowseServer(object):
|
|||||||
except:
|
except:
|
||||||
raise cherrypy.HTTPError(404, 'invalid id: %r'%id)
|
raise cherrypy.HTTPError(404, 'invalid id: %r'%id)
|
||||||
|
|
||||||
ans = self.browse_render_details(id_)
|
ans = self.browse_render_details(id_, add_title=True)
|
||||||
return self.browse_template('').format(
|
return self.browse_template('').format(
|
||||||
title='', script='book();', main=ans)
|
title=self.db.title(id_, index_is_id=True), script='book();', main=ans)
|
||||||
|
|
||||||
# }}}
|
# }}}
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user