merge stable
authorSylvain Thénault <sylvain.thenault@logilab.fr>
Tue, 21 Jul 2009 13:11:00 +0200
branchstable
changeset 2405 443449336153
parent 2403 74f7fa676a52 (diff)
parent 2404 2d3c1a3f76c5 (current diff)
child 2406 306fcb9d4df7
merge
web/test/unittest_viewselector.py
--- a/web/test/unittest_viewselector.py	Tue Jul 21 13:04:33 2009 +0200
+++ b/web/test/unittest_viewselector.py	Tue Jul 21 13:11:00 2009 +0200
@@ -59,6 +59,9 @@
             print 'missing', [v for v in content.keys() if not v in expected]
             raise
 
+    def setUp(self):
+        super(VRegistryTC, self).setUp()
+        assert self.vreg['views']['propertiesform']
 
     def test_possible_views_none_rset(self):
         req = self.request()
@@ -123,6 +126,7 @@
                               ])
 
     def test_propertiesform_admin(self):
+        assert self.vreg['views']['propertiesform']
         rset1, req1 = self.env.get_rset_and_req('CWUser X WHERE X login "admin"')
         rset2, req2 = self.env.get_rset_and_req('CWUser X WHERE X login "anon"')
         self.failUnless(self.vreg.select_object('views', 'propertiesform', req1, rset=None))
--- a/web/views/cwproperties.py	Tue Jul 21 13:04:33 2009 +0200
+++ b/web/views/cwproperties.py	Tue Jul 21 13:11:00 2009 +0200
@@ -230,7 +230,7 @@
     __select__ = (
         (none_rset() & match_user_groups('users','managers'))
         | (one_line_rset() & match_user_groups('users') & is_user_prefs())
-        | (one_line_rset() & match_user_groups('managers') & implements('CWUSer'))
+        | (one_line_rset() & match_user_groups('managers') & implements('CWUser'))
         )
 
     title = _('preferences')