Switch to unified view

a/Allura/allura/websetup/bootstrap.py b/Allura/allura/websetup/bootstrap.py
...
...
56
    except: # pragma no cover
56
    except: # pragma no cover
57
        log.error('SOLR server is %s', g.solr_server)
57
        log.error('SOLR server is %s', g.solr_server)
58
        log.error('Error clearing solr index')
58
        log.error('Error clearing solr index')
59
    if asbool(conf.get('cache_test_data')):
59
    if asbool(conf.get('cache_test_data')):
60
        if restore_test_data():
60
        if restore_test_data():
61
            c.project = M.Project.query.get(shortname='test')
61
            from allura.lib import helpers as h
62
            h.set_context('test', neighborhood='Projects')
62
            return
63
            return
63
    log.info('Initializing search')
64
    log.info('Initializing search')
64
65
65
    log.info('Registering root user & default neighborhoods')
66
    log.info('Registering root user & default neighborhoods')
66
    anonymous = M.User(_id=None,
67
    anonymous = M.User(_id=None,
...
...
143
    c.project = p0
144
    c.project = p0
144
    c.user = u_admin
145
    c.user = u_admin
145
    p1 = p0.new_subproject('sub1')
146
    p1 = p0.new_subproject('sub1')
146
    ThreadLocalORMSession.flush_all()
147
    ThreadLocalORMSession.flush_all()
147
    if asbool(conf.get('load_test_data')):
148
    if asbool(conf.get('load_test_data')):
148
        u_proj = M.Project.query.get(shortname='u/test-admin')
149
        u_proj = M.Project.query.get(shortname='u/test-admin', neighborhood_id=n_users._id)
149
        app = p0.install_app('SVN', 'src', 'SVN')
150
        app = p0.install_app('SVN', 'src', 'SVN')
150
        app = p0.install_app('Git', 'src-git', 'Git')
151
        app = p0.install_app('Git', 'src-git', 'Git')
151
        app.config.options['type'] = 'git'
152
        app.config.options['type'] = 'git'
152
        app = p0.install_app('Hg', 'src-hg', 'Mercurial')
153
        app = p0.install_app('Hg', 'src-hg', 'Mercurial')
153
        app.config.options['type'] = 'hg'
154
        app.config.options['type'] = 'hg'