Switch to unified view

a/Allura/allura/controllers/project.py b/Allura/allura/controllers/project.py
...
...
84
        return ProjectController(), remainder
84
        return ProjectController(), remainder
85
85
86
    @expose('jinja:allura:templates/neighborhood_project_list.html')
86
    @expose('jinja:allura:templates/neighborhood_project_list.html')
87
    @with_trailing_slash
87
    @with_trailing_slash
88
    def index(self, sort='alpha', limit=25, page=0, **kw):
88
    def index(self, sort='alpha', limit=25, page=0, **kw):
89
        c.project = self.neighborhood.neighborhood_project
89
        if self.neighborhood.redirect:
90
        if self.neighborhood.redirect:
90
            redirect(self.neighborhood.redirect)
91
            redirect(self.neighborhood.redirect)
91
        c.project_summary = W.project_summary
92
        c.project_summary = W.project_summary
92
        c.page_list = W.page_list
93
        c.page_list = W.page_list
93
        limit, page, start = g.handle_paging(limit, page)
94
        limit, page, start = g.handle_paging(limit, page)
...
...
120
                    limit=limit, page=page, count=count)
121
                    limit=limit, page=page, count=count)
121
122
122
    @expose('jinja:allura:templates/neighborhood_add_project.html')
123
    @expose('jinja:allura:templates/neighborhood_add_project.html')
123
    @without_trailing_slash
124
    @without_trailing_slash
124
    def add_project(self, **form_data):
125
    def add_project(self, **form_data):
126
        c.project = self.neighborhood.neighborhood_project
125
        require_access(self.neighborhood, 'register')
127
        require_access(self.neighborhood, 'register')
126
        c.add_project = W.add_project
128
        c.add_project = W.add_project
127
        form_data['tools'] = ['Wiki','Git','Tickets','Downloads','Discussion']
129
        form_data['tools'] = ['Wiki','Git','Tickets','Downloads','Discussion']
128
        form_data['neighborhood'] = self.neighborhood.name
130
        form_data['neighborhood'] = self.neighborhood.name
129
        return dict(neighborhood=self.neighborhood, form_data=form_data)
131
        return dict(neighborhood=self.neighborhood, form_data=form_data)
...
...
183
        self.nav_stub = '%sbrowse/' % self.neighborhood.url()
185
        self.nav_stub = '%sbrowse/' % self.neighborhood.url()
184
        self.additional_filters = {'neighborhood_id':self.neighborhood._id}
186
        self.additional_filters = {'neighborhood_id':self.neighborhood._id}
185
187
186
    @expose()
188
    @expose()
187
    def _lookup(self, category_name, *remainder):
189
    def _lookup(self, category_name, *remainder):
190
        c.project = self.neighborhood.neighborhood_project
188
        category_name=unquote(category_name)
191
        category_name=unquote(category_name)
189
        return NeighborhoodProjectBrowseController(neighborhood=self.neighborhood, category_name=category_name, parent_category=self.category), remainder
192
        return NeighborhoodProjectBrowseController(neighborhood=self.neighborhood, category_name=category_name, parent_category=self.category), remainder
190
193
191
    @expose('jinja:allura:templates/neighborhood_project_list.html')
194
    @expose('jinja:allura:templates/neighborhood_project_list.html')
192
    @without_trailing_slash
195
    @without_trailing_slash