Mercurial > kallithea
changeset 2390:b0d09c20f608 beta
public journal feed updates. fixes errors
- changed the urls to more friendly looking public_journal/rss|atom
- old one will still work for backward compatibility
author | Marcin Kuzminski <marcin@python-works.com> |
---|---|
date | Tue, 05 Jun 2012 01:06:40 +0200 |
parents | 324b838250c9 |
children | 91fae60bf2b6 d815d617eb5e 30589acf820e |
files | rhodecode/config/routing.py rhodecode/controllers/journal.py |
diffstat | 2 files changed, 12 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/rhodecode/config/routing.py Tue Jun 05 00:48:20 2012 +0200 +++ b/rhodecode/config/routing.py Tue Jun 05 01:06:40 2012 +0200 @@ -342,10 +342,17 @@ rmap.connect('public_journal', '%s/public_journal' % ADMIN_PREFIX, controller='journal', action="public_journal") - rmap.connect('public_journal_rss', '%s/public_journal_rss' % ADMIN_PREFIX, + rmap.connect('public_journal_rss', '%s/public_journal/rss' % ADMIN_PREFIX, + controller='journal', action="public_journal_rss") + + rmap.connect('public_journal_rss_old', '%s/public_journal_rss' % ADMIN_PREFIX, controller='journal', action="public_journal_rss") rmap.connect('public_journal_atom', + '%s/public_journal/atom' % ADMIN_PREFIX, controller='journal', + action="public_journal_atom") + + rmap.connect('public_journal_atom_old', '%s/public_journal_atom' % ADMIN_PREFIX, controller='journal', action="public_journal_atom")
--- a/rhodecode/controllers/journal.py Tue Jun 05 00:48:20 2012 +0200 +++ b/rhodecode/controllers/journal.py Tue Jun 05 01:06:40 2012 +0200 @@ -192,8 +192,8 @@ ttl=self.ttl) for entry in journal[:self.feed_nr]: - action, action_extra = h.action_parser(entry, feed=True) - title = "%s - %s %s" % (entry.user.short_contact, action, + action, action_extra, ico = h.action_parser(entry, feed=True) + title = "%s - %s %s" % (entry.user.short_contact, action(), entry.repository.repo_name) desc = action_extra() feed.add_item(title=title, @@ -225,8 +225,8 @@ ttl=self.ttl) for entry in journal[:self.feed_nr]: - action, action_extra = h.action_parser(entry, feed=True) - title = "%s - %s %s" % (entry.user.short_contact, action, + action, action_extra, ico = h.action_parser(entry, feed=True) + title = "%s - %s %s" % (entry.user.short_contact, action(), entry.repository.repo_name) desc = action_extra() feed.add_item(title=title,