Commit: 3a256826539ed97e61b0e5045fef7103cf4a5ff0 - allura (git)

allura

Commit MetaInfo

• Revisão: 3a256826539ed97e61b0e5045fef7103cf4a5ff0 (tree)
• Hora: 2012-07-18 23:28:54
• Autor: Igor Bondarenko <jetmind2@gmai...>
• Commiter: Dave Brondsema

Mensagem de Log

[#4349] ticket:119 add test and change projects lookups

Mudança Sumário

• modified: Allura/allura/controllers/site_admin.py
• modified: Allura/allura/templates/site_admin_new_projects.html
• modified: Allura/allura/tests/functional/test_site_admin.py

Diff

--- a/Allura/allura/controllers/site_admin.py
+++ b/Allura/allura/controllers/site_admin.py
@@ -178,7 +178,8 @@ class SiteAdminController(object):
         c.page_size = W.page_size
         limit, pagenum, start = g.handle_paging(limit, page, default=100)
         count = 0
-        projects = (M.Project.query.find({'name': {'$regex': '^[^u][^/]'}})
+        nb = M.Neighborhood.query.get(name='Users')
+        projects = (M.Project.query.find({'neighborhood_id': {'$ne': nb._id}})
                                    .sort('_id', -1))
         count = projects.count()
         projects = projects.skip(start).limit(limit)

--- a/Allura/allura/templates/site_admin_new_projects.html
+++ b/Allura/allura/templates/site_admin_new_projects.html
@@ -26,7 +26,7 @@
         <small>{{ p._id.generation_time.strftime('%Y-%m-%d %H:%M:%S') }}</small>
       </td>
       <td><small>{{ p.shortname }}</small></td>
-      <td><small>{{ p.name }}</small></td>
+      <td><small><a href="{{ p.url() }}">{{ p.name }}</a></small></td>
       <td><small>{{ p.short_description }}</small></td>
       <td><small>{{ p.summary }}</small></td>
       <td><small>{{ 'Yes' if p.deleted else 'No' }}</small></td>

--- a/Allura/allura/tests/functional/test_site_admin.py
+++ b/Allura/allura/tests/functional/test_site_admin.py
@@ -47,3 +47,16 @@ class TestSiteAdmin(TestController):
         r = self.app.get('/nf/admin/new_projects', extra_environ=dict(
             username='*anonymous'), status=302).follow()
         assert 'Login' in r
+
+    def test_new_projects(self):
+        r = self.app.get('/nf/admin/new_projects', extra_environ=dict(
+                username='root'))
+        headers = r.html.find('table').findAll('th')
+        assert headers[1].contents[0] == 'Created'
+        assert headers[2].contents[0] == 'Shortname'
+        assert headers[3].contents[0] == 'Name'
+        assert headers[4].contents[0] == 'Short description'
+        assert headers[5].contents[0] == 'Summary'
+        assert headers[6].contents[0] == 'Deleted?'
+        assert headers[7].contents[0] == 'Homepage'
+        assert headers[8].contents[0] == 'Admins'