# HG changeset patch # User Sylvain Thénault # Date 1248430431 -7200 # Node ID 3e2b50ece7261eea68da1a2e81910d1abb7ddf8b # Parent 569d6641f08c9ce05a2b1225ce4d73a7b10204f6 begin to drop ref to secondary view diff -r 569d6641f08c -r 3e2b50ece726 devtools/fake.py --- a/devtools/fake.py Fri Jul 24 12:10:54 2009 +0200 +++ b/devtools/fake.py Fri Jul 24 12:13:51 2009 +0200 @@ -49,8 +49,7 @@ _registries = { 'controllers' : [Mock(id='view'), Mock(id='login'), Mock(id='logout'), Mock(id='edit')], - 'views' : [Mock(id='primary'), Mock(id='secondary'), - Mock(id='oneline'), Mock(id='list')], + 'views' : [Mock(id='primary'), Mock(id='oneline'), Mock(id='list')], } def registry_objects(self, name, oid=None): diff -r 569d6641f08c -r 3e2b50ece726 goa/test/unittest_views.py --- a/goa/test/unittest_views.py Fri Jul 24 12:10:54 2009 +0200 +++ b/goa/test/unittest_views.py Fri Jul 24 12:13:51 2009 +0200 @@ -51,7 +51,7 @@ def test_django_index(self): self.vreg.render('views', 'index', self.req, rset=None) -for vid in ('primary', 'secondary', 'oneline', 'incontext', 'outofcontext', 'text'): +for vid in ('primary', 'oneline', 'incontext', 'outofcontext', 'text'): setattr(SomeViewsTC, 'test_%s'%vid, lambda self, vid=vid: self.blog.view(vid)) if __name__ == '__main__': diff -r 569d6641f08c -r 3e2b50ece726 web/views/baseviews.py --- a/web/views/baseviews.py Fri Jul 24 12:10:54 2009 +0200 +++ b/web/views/baseviews.py Fri Jul 24 12:13:51 2009 +0200 @@ -2,7 +2,7 @@ * noresult, final * primary, sidebox -* secondary, oneline, incontext, outofcontext, text +* oneline, incontext, outofcontext, text * list @@ -101,6 +101,7 @@ self.wdata(printable_value(self.req, etype, value, props, displaytime=displaytime)) +# XXX deprecated class SecondaryView(EntityView): id = 'secondary' title = _('secondary') @@ -180,9 +181,6 @@ self.w(u'') -# new default views for finner control in general views , to use instead of -# oneline / secondary - class InContextTextView(TextView): id = 'textincontext' title = None # not listed as a possible view diff -r 569d6641f08c -r 3e2b50ece726 web/views/timetable.py --- a/web/views/timetable.py Fri Jul 24 12:10:54 2009 +0200 +++ b/web/views/timetable.py Fri Jul 24 12:13:51 2009 +0200 @@ -138,7 +138,7 @@ for user, width in zip(users, widths): self.w(u'' % max(MIN_COLS, width)) if user != u"*": - user.view('secondary', w=self.w) + user.view('oneline', w=self.w) else: self.w(user) self.w(u'')