Show More
@@ -342,10 +342,17 b' def make_map(config):' | |||||
342 | rmap.connect('public_journal', '%s/public_journal' % ADMIN_PREFIX, |
|
342 | rmap.connect('public_journal', '%s/public_journal' % ADMIN_PREFIX, | |
343 | controller='journal', action="public_journal") |
|
343 | controller='journal', action="public_journal") | |
344 |
|
344 | |||
345 |
rmap.connect('public_journal_rss', '%s/public_journal |
|
345 | rmap.connect('public_journal_rss', '%s/public_journal/rss' % ADMIN_PREFIX, | |
|
346 | controller='journal', action="public_journal_rss") | |||
|
347 | ||||
|
348 | rmap.connect('public_journal_rss_old', '%s/public_journal_rss' % ADMIN_PREFIX, | |||
346 | controller='journal', action="public_journal_rss") |
|
349 | controller='journal', action="public_journal_rss") | |
347 |
|
350 | |||
348 | rmap.connect('public_journal_atom', |
|
351 | rmap.connect('public_journal_atom', | |
|
352 | '%s/public_journal/atom' % ADMIN_PREFIX, controller='journal', | |||
|
353 | action="public_journal_atom") | |||
|
354 | ||||
|
355 | rmap.connect('public_journal_atom_old', | |||
349 | '%s/public_journal_atom' % ADMIN_PREFIX, controller='journal', |
|
356 | '%s/public_journal_atom' % ADMIN_PREFIX, controller='journal', | |
350 | action="public_journal_atom") |
|
357 | action="public_journal_atom") | |
351 |
|
358 |
@@ -192,8 +192,8 b' class JournalController(BaseController):' | |||||
192 | ttl=self.ttl) |
|
192 | ttl=self.ttl) | |
193 |
|
193 | |||
194 | for entry in journal[:self.feed_nr]: |
|
194 | for entry in journal[:self.feed_nr]: | |
195 | action, action_extra = h.action_parser(entry, feed=True) |
|
195 | action, action_extra, ico = h.action_parser(entry, feed=True) | |
196 | title = "%s - %s %s" % (entry.user.short_contact, action, |
|
196 | title = "%s - %s %s" % (entry.user.short_contact, action(), | |
197 | entry.repository.repo_name) |
|
197 | entry.repository.repo_name) | |
198 | desc = action_extra() |
|
198 | desc = action_extra() | |
199 | feed.add_item(title=title, |
|
199 | feed.add_item(title=title, | |
@@ -225,8 +225,8 b' class JournalController(BaseController):' | |||||
225 | ttl=self.ttl) |
|
225 | ttl=self.ttl) | |
226 |
|
226 | |||
227 | for entry in journal[:self.feed_nr]: |
|
227 | for entry in journal[:self.feed_nr]: | |
228 | action, action_extra = h.action_parser(entry, feed=True) |
|
228 | action, action_extra, ico = h.action_parser(entry, feed=True) | |
229 | title = "%s - %s %s" % (entry.user.short_contact, action, |
|
229 | title = "%s - %s %s" % (entry.user.short_contact, action(), | |
230 | entry.repository.repo_name) |
|
230 | entry.repository.repo_name) | |
231 | desc = action_extra() |
|
231 | desc = action_extra() | |
232 | feed.add_item(title=title, |
|
232 | feed.add_item(title=title, |
General Comments 0
You need to be logged in to leave comments.
Login now