Mercurial > kallithea
diff rhodecode/lib/helpers.py @ 2609:200a5b747e69 beta
- added action when someone closes pull request in journal
- fixed icons and links on pull request comment in journal
| author | Marcin Kuzminski <marcin@python-works.com> |
|---|---|
| date | Sun, 15 Jul 2012 03:15:43 +0200 |
| parents | 19de74e33fb0 |
| children | a221706dab50 |
line wrap: on
line diff
--- a/rhodecode/lib/helpers.py Sun Jul 15 03:14:58 2012 +0200 +++ b/rhodecode/lib/helpers.py Sun Jul 15 03:15:43 2012 +0200 @@ -572,6 +572,13 @@ group_name = action_params return group_name + def get_pull_request(): + pull_request_id = action_params + repo_name = user_log.repository.repo_name + return link_to(_('Pull request #%s') % pull_request_id, + url('pullrequest_show', repo_name=repo_name, + pull_request_id=pull_request_id)) + # action : translated str, callback(extractor), icon action_map = { 'user_deleted_repo': (_('[deleted] repository'), @@ -602,8 +609,10 @@ get_users_group, 'group_edit.png'), 'user_commented_revision': (_('[commented] on revision in repository'), get_cs_links, 'comment_add.png'), - 'user_commented_pull_request': (_('[commented] on pull request'), - get_cs_links, 'comment_add.png'), + 'user_commented_pull_request': (_('[commented] on pull request for'), + get_pull_request, 'comment_add.png'), + 'user_closed_pull_request': (_('[closed] pull request for'), + get_pull_request, 'tick.png'), 'push': (_('[pushed] into'), get_cs_links, 'script_add.png'), 'push_local': (_('[committed via RhodeCode] into repository'),