Switch to unified view

a/Allura/allura/lib/custom_middleware.py b/Allura/allura/lib/custom_middleware.py
...
...
30
30
31
    def __init__(self, app, script_name=''):
31
    def __init__(self, app, script_name=''):
32
        self.app = app
32
        self.app = app
33
        self.script_name = script_name
33
        self.script_name = script_name
34
        self.directories = [
34
        self.directories = [
35
            (self.script_name + ep.name + '/', ep)
35
            (self.script_name + ep.name.lower() + '/', ep)
36
            for ep in pkg_resources.iter_entry_points('allura') ]
36
            for ep in pkg_resources.iter_entry_points('allura') ]
37
37
38
    def __call__(self, environ, start_response):
38
    def __call__(self, environ, start_response):
39
        environ['static.script_name'] = self.script_name
39
        environ['static.script_name'] = self.script_name
40
        if not environ['PATH_INFO'].startswith(self.script_name):
40
        if not environ['PATH_INFO'].startswith(self.script_name):
...
...
51
            if environ['PATH_INFO'].startswith(prefix):
51
            if environ['PATH_INFO'].startswith(prefix):
52
                filename = environ['PATH_INFO'][len(prefix):]
52
                filename = environ['PATH_INFO'][len(prefix):]
53
                file_path = pkg_resources.resource_filename(
53
                file_path = pkg_resources.resource_filename(
54
                    ep.module_name, os.path.join(
54
                    ep.module_name, os.path.join(
55
                        'nf',
55
                        'nf',
56
                        ep.name,
56
                        ep.name.lower(),
57
                        filename))
57
                        filename))
58
                return fileapp.FileApp(file_path, [
58
                return fileapp.FileApp(file_path, [
59
                        ('Access-Control-Allow-Origin', '*')])
59
                        ('Access-Control-Allow-Origin', '*')])
60
        filename = environ['PATH_INFO'][len(self.script_name):]
60
        filename = environ['PATH_INFO'][len(self.script_name):]
61
        file_path = pkg_resources.resource_filename(
61
        file_path = pkg_resources.resource_filename(