Switch to unified view

a/Allura/allura/controllers/discuss.py b/Allura/allura/controllers/discuss.py
...
...
89
    @validate(dict(
89
    @validate(dict(
90
            since=DateTimeConverter(if_empty=None),
90
            since=DateTimeConverter(if_empty=None),
91
            until=DateTimeConverter(if_empty=None),
91
            until=DateTimeConverter(if_empty=None),
92
            page=validators.Int(if_empty=None),
92
            page=validators.Int(if_empty=None),
93
            limit=validators.Int(if_empty=None)))
93
            limit=validators.Int(if_empty=None)))
94
    def feed(self, since=None, until=None, page=None, limit=None):
94
    def feed(self, since=None, until=None, page=None, limit=None, **kw):
95
        if request.environ['PATH_INFO'].endswith('.atom'):
95
        if request.environ['PATH_INFO'].endswith('.atom'):
96
            feed_type = 'atom'
96
            feed_type = 'atom'
97
        else:
97
        else:
98
            feed_type = 'rss'
98
            feed_type = 'rss'
99
        title = 'Recent posts to %s' % self.discussion.name
99
        title = 'Recent posts to %s' % self.discussion.name
...
...
215
    @validate(dict(
215
    @validate(dict(
216
            since=DateTimeConverter(if_empty=None),
216
            since=DateTimeConverter(if_empty=None),
217
            until=DateTimeConverter(if_empty=None),
217
            until=DateTimeConverter(if_empty=None),
218
            page=validators.Int(if_empty=None),
218
            page=validators.Int(if_empty=None),
219
            limit=validators.Int(if_empty=None)))
219
            limit=validators.Int(if_empty=None)))
220
    def feed(self, since=None, until=None, page=None, limit=None):
220
    def feed(self, since=None, until=None, page=None, limit=None, **kw):
221
        if request.environ['PATH_INFO'].endswith('.atom'):
221
        if request.environ['PATH_INFO'].endswith('.atom'):
222
            feed_type = 'atom'
222
            feed_type = 'atom'
223
        else:
223
        else:
224
            feed_type = 'rss'
224
            feed_type = 'rss'
225
        title = 'Recent posts to %s' % (self.thread.subject or '(no subject)')
225
        title = 'Recent posts to %s' % (self.thread.subject or '(no subject)')