# HG changeset patch # User Marcin Kuzminski # Date 2012-07-15 03:15:43 # Node ID 200a5b747e69ca6e323a8d6b6d5c6357e0cec63a # Parent 58c529332e7e0f8f7592507fb7fe40a9ffcabcd1 - added action when someone closes pull request in journal - fixed icons and links on pull request comment in journal diff --git a/rhodecode/lib/helpers.py b/rhodecode/lib/helpers.py --- a/rhodecode/lib/helpers.py +++ b/rhodecode/lib/helpers.py @@ -572,6 +572,13 @@ def action_parser(user_log, feed=False): 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 @@ def action_parser(user_log, feed=False): 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'),