Switch to unified view

a/Allura/allura/websetup/bootstrap.py b/Allura/allura/websetup/bootstrap.py
...
...
118
    if asbool(conf.get('load_test_data')):
118
    if asbool(conf.get('load_test_data')):
119
        u_admin = M.User.register(dict(username='test-admin',
119
        u_admin = M.User.register(dict(username='test-admin',
120
                                  display_name='Test Admin'))
120
                                  display_name='Test Admin'))
121
        u_admin.set_password('foo')
121
        u_admin.set_password('foo')
122
        u_admin.claim_address('Beta@wiki.test.projects.sourceforge.net')
122
        u_admin.claim_address('Beta@wiki.test.projects.sourceforge.net')
123
        u_admin_adobe = u_admin
124
    else:
123
    else:
125
        u_admin = M.User.register(dict(username='admin1',
124
        u_admin = M.User.register(dict(username='admin1',
126
                                        display_name='Admin 1'))
125
                                        display_name='Admin 1'))
127
        u_admin.set_password('foo')
126
        u_admin.set_password('foo')
128
        u_admin_adobe = M.User.register(dict(username='adobe-admin',
129
                                   display_name='Adobe Admin'))
130
        u_admin_adobe.set_password('foo')
131
        # Admin1 is almost root, with admin access for Users and Projects neighborhoods
127
        # Admin1 is almost root, with admin access for Users and Projects neighborhoods
132
        p_projects.acl.append(
128
        p_projects.add_user(u_admin, ['Admin'])
133
            M.ACE.allow(u_admin.project_role(project=p_projects)._id, 'admin'))
129
        p_users.add_user(u_admin, ['Admin'])
134
        p_users.acl.append(
135
            M.ACE.allow(u_admin.project_role(project=p_projects)._id, 'admin'))
136
130
137
        p_allura = n_projects.register_project('allura', u_admin)
131
        p_allura = n_projects.register_project('allura', u_admin)
138
    u1 = M.User.register(dict(username='test-user',
132
    u1 = M.User.register(dict(username='test-user',
139
                              display_name='Test User'))
133
                              display_name='Test User'))
140
    u1.set_password('foo')
134
    u1.set_password('foo')
141
    p_adobe1 = n_adobe.register_project('adobe-1', u_admin_adobe)
135
    p_adobe1 = n_adobe.register_project('adobe-1', u_admin)
142
    p_adobe.acl.append(
136
    p_adobe.add_user(u_admin, ['Admin'])
143
        M.ACE.allow(u_admin_adobe.project_role(p_adobe)._id, 'admin'))
144
    p0 = n_projects.register_project('test', u_admin)
137
    p0 = n_projects.register_project('test', u_admin)
145
    p0._extra_tool_status = [ 'alpha', 'beta' ]
138
    p0._extra_tool_status = [ 'alpha', 'beta' ]
146
139
147
    sess = session(n_adobe) # all the sessions are the same
140
    sess = session(n_adobe) # all the sessions are the same
148
    for x in (n_adobe, n_projects, n_users, p_projects, p_users, p_adobe):
141
    for x in (n_adobe, n_projects, n_users, p_projects, p_users, p_adobe):