797fe09
@@ -320,8 +320,7 @@
for item in self.menu:
name = getattr(item, 'name', None)
if name:
- urls['%s_url' % name] = cherrypy.url('/%s/%s' % (self.mount,
- name))
+ urls['%s_url' % name] = '%s/%s' % (self.url, name)
return urls
@admin_protect
cherrypy.url returns an absolute URL, not a relative one. Pretty much everywhere else we deal in relative URLs, so ipsilon is generally friendly to being behind a reverse proxy.
Signed-off-by: Howard Johnson merlin@merlinthp.org
Looks good to me. Thanks!
Commit 6216951 fixes this pull-request
Pull-Request has been merged by merlin@merlinthp.org
cherrypy.url returns an absolute URL, not a relative one. Pretty much
everywhere else we deal in relative URLs, so ipsilon is generally
friendly to being behind a reverse proxy.
Signed-off-by: Howard Johnson merlin@merlinthp.org