|
a/Allura/allura/controllers/discuss.py |
|
b/Allura/allura/controllers/discuss.py |
|
... |
|
... |
60 |
if not hasattr(self, 'PostController'):
|
60 |
if not hasattr(self, 'PostController'):
|
61 |
self.PostController = PostController
|
61 |
self.PostController = PostController
|
62 |
if not hasattr(self, 'AttachmentController'):
|
62 |
if not hasattr(self, 'AttachmentController'):
|
63 |
self.AttachmentController = AttachmentController
|
63 |
self.AttachmentController = AttachmentController
|
64 |
|
64 |
|
65 |
@expose('allura.templates.discussion.index')
|
65 |
@expose('jinja:discussion/index.html')
|
66 |
def index(self, threads=None, limit=None, page=0, count=0, **kw):
|
66 |
def index(self, threads=None, limit=None, page=0, count=0, **kw):
|
67 |
c.discussion = self.W.discussion
|
67 |
c.discussion = self.W.discussion
|
68 |
if threads is None:
|
68 |
if threads is None:
|
69 |
threads = self.discussion.threads
|
69 |
threads = self.discussion.threads
|
70 |
return dict(discussion=self.discussion, limit=limit, page=page, count=count, threads=threads)
|
70 |
return dict(discussion=self.discussion, limit=limit, page=page, count=count, threads=threads)
|
|
... |
|
... |
126 |
@expose()
|
126 |
@expose()
|
127 |
def _lookup(self, id, *remainder):
|
127 |
def _lookup(self, id, *remainder):
|
128 |
id=unquote(id)
|
128 |
id=unquote(id)
|
129 |
return self.PostController(self._discussion_controller, self.thread, id), remainder
|
129 |
return self.PostController(self._discussion_controller, self.thread, id), remainder
|
130 |
|
130 |
|
131 |
@expose('allura.templates.discussion.thread')
|
131 |
@expose('jinja:discussion/thread.html')
|
132 |
def index(self, limit=None, page=0, count=0, **kw):
|
132 |
def index(self, limit=None, page=0, count=0, **kw):
|
133 |
c.thread = self.W.thread
|
133 |
c.thread = self.W.thread
|
134 |
c.thread_header = self.W.thread_header
|
134 |
c.thread_header = self.W.thread_header
|
135 |
limit, page, start = g.handle_paging(limit, page)
|
135 |
limit, page, start = g.handle_paging(limit, page)
|
136 |
self.thread.num_views += 1
|
136 |
self.thread.num_views += 1
|