opensourceprojects.eu / osp-allura / Diff of /Allura/allura/controllers/project.py

Diff of /Allura/allura/controllers/project.py [57f7c8] .. [9d8474]

Switch to unified view


...

class NeighborhoodController(object):
    '''Manages a neighborhood of projects.
    '''

    def __init__(self, neighborhood):
        self.neighborhood = neighborhood
        self.neighborhood_name = self.neighborhood.name
        self.prefix = self.neighborhood.shortname_prefix

        self.browse = NeighborhoodProjectBrowseController(neighborhood=self.neighborhood)
        self._admin = NeighborhoodAdminController(self.neighborhood)
        self._moderate = NeighborhoodModerateController(self.neighborhood)

    def _check_security(self):
...
        c.page_list = W.page_list
        limit, page, start = g.handle_paging(limit, page)
        pq = M.Project.query.find(dict(
                neighborhood_id=self.neighborhood._id,
                deleted=False,
                is_nbhd_project=False,
                ))
        if sort == 'alpha':
            pq.sort('name')
        else:
            pq.sort('last_updated', pymongo.DESCENDING)

	a/Allura/allura/controllers/project.py		b/Allura/allura/controllers/project.py
	...		...
45		45
46	class NeighborhoodController(object):	46	class NeighborhoodController(object):
47	'''Manages a neighborhood of projects.	47	'''Manages a neighborhood of projects.
48	'''	48	'''
49		49
50	def __init__(self, neighborhood_name, prefix=''):	50	def __init__(self, neighborhood):
		51	self.neighborhood = neighborhood
51	self.neighborhood_name = neighborhood_name	52	self.neighborhood_name = self.neighborhood.name
52	self.neighborhood = M.Neighborhood.query.get(name=self.neighborhood_name)	53	self.prefix = self.neighborhood.shortname_prefix
53	self.prefix = prefix
54	self.browse = NeighborhoodProjectBrowseController(neighborhood=self.neighborhood)	54	self.browse = NeighborhoodProjectBrowseController(neighborhood=self.neighborhood)
55	self._admin = NeighborhoodAdminController(self.neighborhood)	55	self._admin = NeighborhoodAdminController(self.neighborhood)
56	self._moderate = NeighborhoodModerateController(self.neighborhood)	56	self._moderate = NeighborhoodModerateController(self.neighborhood)
57		57
58	def _check_security(self):	58	def _check_security(self):
	...		...
94	c.page_list = W.page_list	94	c.page_list = W.page_list
95	limit, page, start = g.handle_paging(limit, page)	95	limit, page, start = g.handle_paging(limit, page)
96	pq = M.Project.query.find(dict(	96	pq = M.Project.query.find(dict(
97	neighborhood_id=self.neighborhood._id,	97	neighborhood_id=self.neighborhood._id,
98	deleted=False,	98	deleted=False,
99	shortname={'$ne':'--init--'}	99	is_nbhd_project=False,
100	))	100	))
101	if sort == 'alpha':	101	if sort == 'alpha':
102	pq.sort('name')	102	pq.sort('name')
103	else:	103	else:
104	pq.sort('last_updated', pymongo.DESCENDING)	104	pq.sort('last_updated', pymongo.DESCENDING)