From 2425e2c09bb5283241e92a425e9798548e2ac454 Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Sat, 3 Sep 2011 08:24:46 -0600 Subject: [PATCH] Content server: Fix --url-prefix not used for links in the book details view. --- src/calibre/library/server/base.py | 2 ++ src/calibre/library/server/browse.py | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/calibre/library/server/base.py b/src/calibre/library/server/base.py index 2f345eb670..26e4d3469e 100644 --- a/src/calibre/library/server/base.py +++ b/src/calibre/library/server/base.py @@ -49,6 +49,8 @@ class DispatchController(object): # {{{ elif self.prefix: self.dispatcher.connect(name+'prefix_extra', self.prefix, self, **kwargs) + self.dispatcher.connect(name+'prefix_extra_trailing', + self.prefix+'/', self, **kwargs) self.dispatcher.connect(name, route, self, **kwargs) self.funcs.append(expose(func)) diff --git a/src/calibre/library/server/browse.py b/src/calibre/library/server/browse.py index e4c21e4ed9..afea6baa32 100644 --- a/src/calibre/library/server/browse.py +++ b/src/calibre/library/server/browse.py @@ -695,8 +695,8 @@ class BrowseServer(object): for tag in dbtags: tval = ('{2}') - href='/browse/matches/%s/%s' % \ - (quote(tag.category), quote(str(tag.id))) + href='%s/browse/matches/%s/%s' % \ + (self.opts.url_prefix, quote(tag.category), quote(str(tag.id))) vals.append(tval.format(xml(tag.name, True), xml(href, True), xml(val if len(dbtags) == 1 else tag.name),