Files
@ cac5109ac3b6
Branch filter:
Location: kallithea/rhodecode/model/comment.py - annotation
cac5109ac3b6
4.3 KiB
text/x-python
Notification system improvements
- deleting
- tests
- ui
- moved to separate controller
- deleting
- tests
- ui
- moved to separate controller
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 | d2de0c2f02cd d2de0c2f02cd d2de0c2f02cd d2de0c2f02cd d2de0c2f02cd d2de0c2f02cd d2de0c2f02cd d2de0c2f02cd d2de0c2f02cd d2de0c2f02cd d2de0c2f02cd d2de0c2f02cd d2de0c2f02cd d2de0c2f02cd d2de0c2f02cd d2de0c2f02cd d2de0c2f02cd d2de0c2f02cd d2de0c2f02cd d2de0c2f02cd d2de0c2f02cd d2de0c2f02cd d2de0c2f02cd d2de0c2f02cd d2de0c2f02cd cac5109ac3b6 d2de0c2f02cd d2de0c2f02cd d2de0c2f02cd cac5109ac3b6 cac5109ac3b6 cac5109ac3b6 cac5109ac3b6 d2de0c2f02cd cac5109ac3b6 f23828b00b21 d2de0c2f02cd d2de0c2f02cd d2de0c2f02cd d2de0c2f02cd d2de0c2f02cd d2de0c2f02cd d2de0c2f02cd cac5109ac3b6 cac5109ac3b6 cac5109ac3b6 cac5109ac3b6 cac5109ac3b6 cac5109ac3b6 cac5109ac3b6 cac5109ac3b6 cac5109ac3b6 7c487d2678c7 d2de0c2f02cd d2de0c2f02cd d2de0c2f02cd d2de0c2f02cd d2de0c2f02cd d2de0c2f02cd d2de0c2f02cd 7c487d2678c7 d2de0c2f02cd d2de0c2f02cd d2de0c2f02cd 7276b170ce8b cac5109ac3b6 cac5109ac3b6 7276b170ce8b cac5109ac3b6 7276b170ce8b 7276b170ce8b 7276b170ce8b 7276b170ce8b 7276b170ce8b d2de0c2f02cd 7276b170ce8b cac5109ac3b6 f23828b00b21 f23828b00b21 cac5109ac3b6 cac5109ac3b6 cac5109ac3b6 cac5109ac3b6 cac5109ac3b6 cac5109ac3b6 cac5109ac3b6 cac5109ac3b6 cac5109ac3b6 cac5109ac3b6 f23828b00b21 f23828b00b21 cac5109ac3b6 f23828b00b21 f23828b00b21 f23828b00b21 f23828b00b21 7276b170ce8b d2de0c2f02cd d2de0c2f02cd d2de0c2f02cd d2de0c2f02cd d2de0c2f02cd d2de0c2f02cd d2de0c2f02cd d2de0c2f02cd d2de0c2f02cd d2de0c2f02cd d2de0c2f02cd 7c487d2678c7 7c487d2678c7 7c487d2678c7 7c487d2678c7 7c487d2678c7 7c487d2678c7 7c487d2678c7 7c487d2678c7 7c487d2678c7 7276b170ce8b 7c487d2678c7 7c487d2678c7 1bf03daafaf0 1bf03daafaf0 1bf03daafaf0 7276b170ce8b 7276b170ce8b 7c487d2678c7 7c487d2678c7 7276b170ce8b 7276b170ce8b | # -*- coding: utf-8 -*-
"""
rhodecode.model.comment
~~~~~~~~~~~~~~~~~~~~~~~
comments model for RhodeCode
:created_on: Nov 11, 2011
:author: marcink
:copyright: (C) 2009-2011 Marcin Kuzminski <marcin@python-works.com>
:license: GPLv3, see COPYING for more details.
"""
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
import re
import logging
import traceback
from pylons.i18n.translation import _
from sqlalchemy.util.compat import defaultdict
from rhodecode.lib import helpers as h
from rhodecode.model import BaseModel
from rhodecode.model.db import ChangesetComment, User, Repository, Notification
from rhodecode.model.notification import NotificationModel
log = logging.getLogger(__name__)
class ChangesetCommentsModel(BaseModel):
def _extract_mentions(self, s):
usrs = []
for username in re.findall(r'(?:^@|\s@)(\w+)', s):
user_obj = User.get_by_username(username, case_insensitive=True)
if user_obj:
usrs.append(user_obj)
return usrs
def create(self, text, repo_id, user_id, revision, f_path=None,
line_no=None):
"""
Creates new comment for changeset
:param text:
:param repo_id:
:param user_id:
:param revision:
:param f_path:
:param line_no:
"""
if text:
repo = Repository.get(repo_id)
desc = repo.scm_instance.get_changeset(revision).message
comment = ChangesetComment()
comment.repo = repo
comment.user_id = user_id
comment.revision = revision
comment.text = text
comment.f_path = f_path
comment.line_no = line_no
self.sa.add(comment)
self.sa.flush()
# make notification
line = ''
if line_no:
line = _('on line %s') % line_no
subj = h.link_to('Re commit: %(commit_desc)s %(line)s' % \
{'commit_desc':desc,'line':line},
h.url('changeset_home', repo_name=repo.repo_name,
revision = revision,
anchor = 'comment-%s' % comment.comment_id
)
)
body = text
recipients = ChangesetComment.get_users(revision=revision)
recipients += self._extract_mentions(body)
NotificationModel().create(created_by=user_id, subject=subj,
body = body, recipients = recipients,
type_ = Notification.TYPE_CHANGESET_COMMENT)
return comment
def delete(self, comment_id):
"""
Deletes given comment
:param comment_id:
"""
comment = ChangesetComment.get(comment_id)
self.sa.delete(comment)
self.sa.commit()
return comment
def get_comments(self, repo_id, revision):
return ChangesetComment.query()\
.filter(ChangesetComment.repo_id == repo_id)\
.filter(ChangesetComment.revision == revision)\
.filter(ChangesetComment.line_no == None)\
.filter(ChangesetComment.f_path == None).all()
def get_inline_comments(self, repo_id, revision):
comments = self.sa.query(ChangesetComment)\
.filter(ChangesetComment.repo_id == repo_id)\
.filter(ChangesetComment.revision == revision)\
.filter(ChangesetComment.line_no != None)\
.filter(ChangesetComment.f_path != None).all()
paths = defaultdict(lambda:defaultdict(list))
for co in comments:
paths[co.f_path][co.line_no].append(co)
return paths.items()
|