Mercurial > kallithea
comparison rhodecode/controllers/journal.py @ 2375:bc2d8c03c050 beta
Implemented #467 Journal logs comments on changesets
- added created/updated user action to journal
- added created/updated users group action journal
- added ip adresses to most of action_log calls to track IP changes
- rewrote action_parser to simpler and more efficient solution
author | Marcin Kuzminski <marcin@python-works.com> |
---|---|
date | Sun, 03 Jun 2012 00:40:14 +0200 |
parents | a76e9bacbedc |
children | b0d09c20f608 |
comparison
equal
deleted
inserted
replaced
2374:be2163ef127e | 2375:bc2d8c03c050 |
---|---|
190 description=_('Public journal'), | 190 description=_('Public journal'), |
191 language=self.language, | 191 language=self.language, |
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 #tmpl = h.action_parser(entry)[0] | |
196 action, action_extra = h.action_parser(entry, feed=True) | 195 action, action_extra = h.action_parser(entry, feed=True) |
197 title = "%s - %s %s" % (entry.user.short_contact, action, | 196 title = "%s - %s %s" % (entry.user.short_contact, action, |
198 entry.repository.repo_name) | 197 entry.repository.repo_name) |
199 desc = action_extra() | 198 desc = action_extra() |
200 feed.add_item(title=title, | 199 feed.add_item(title=title, |
224 description=_('Public journal'), | 223 description=_('Public journal'), |
225 language=self.language, | 224 language=self.language, |
226 ttl=self.ttl) | 225 ttl=self.ttl) |
227 | 226 |
228 for entry in journal[:self.feed_nr]: | 227 for entry in journal[:self.feed_nr]: |
229 #tmpl = h.action_parser(entry)[0] | |
230 action, action_extra = h.action_parser(entry, feed=True) | 228 action, action_extra = h.action_parser(entry, feed=True) |
231 title = "%s - %s %s" % (entry.user.short_contact, action, | 229 title = "%s - %s %s" % (entry.user.short_contact, action, |
232 entry.repository.repo_name) | 230 entry.repository.repo_name) |
233 desc = action_extra() | 231 desc = action_extra() |
234 feed.add_item(title=title, | 232 feed.add_item(title=title, |