# # # patch "viewmtn.py" # from [7728db1166843eaeee789a1c821dcc4f804c96c7] # to [312363bf7024ccb33effbe7ae724a82eb7fa1a48] # ============================================================ --- viewmtn.py 7728db1166843eaeee789a1c821dcc4f804c96c7 +++ viewmtn.py 312363bf7024ccb33effbe7ae724a82eb7fa1a48 @@ -33,12 +33,15 @@ debug = web.debug # /getjson.py -> /json[...] (private) +dynamic_join = lambda path: urlparse.urljoin(config.dynamic_uri_path, path) +static_join = lambda path: urlparse.urljoin(config.static_uri_path, path) + class Link: def __init__(self, description=None): self.relative_uri = None self.description = description def html(self): - return '%s' % (self.relative_uri, + return '%s' % (dynamic_join(self.relative_uri), self.description) class RevisionLink(Link): @@ -170,10 +173,10 @@ class Renderer: self.terms = { 'context' : web.context, # fugly 'dynamic_uri_path' : config.dynamic_uri_path, - 'dynamic_join' : lambda path: urlparse.urljoin(config.dynamic_uri_path, path), + 'dynamic_join' : dynamic_join, 'link' : link, 'static_uri_path' : config.static_uri_path, - 'static_join' : lambda path: urlparse.urljoin(config.static_uri_path, path), + 'static_join' : static_join, } def load_templates(self): @@ -220,6 +223,7 @@ class RevisionDiff: class RevisionDiff: def GET(self, revision_from, revision_to): + debug("I'm here...") revision_from = mtn.Revision(revision_from) revision_to = mtn.Revision(revision_to) renderer.render('revisiondiff.html', @@ -266,8 +270,8 @@ urls = ( '/branch/changes/(.*)', 'BranchChanges', '/branch/head/(.*)', 'BranchHead', - '/branch/tar/(.*)', 'BranchTar' - + '/branch/tar/(.*)', 'BranchTar', + '/static/(.*)', 'Static' ) if __name__ == '__main__':