##// END OF EJS Templates
fixes inline comments double entries
fixes inline comments double entries

File last commit:

r1681:1bf03daa beta
r1681:1bf03daa beta
Show More
comment.py
95 lines | 2.9 KiB | text/x-python | PythonLexer
#77 code review...
r1670 # -*- 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 logging
import traceback
from rhodecode.model import BaseModel
from rhodecode.model.db import ChangesetComment
code refactoring
r1675 from sqlalchemy.util.compat import defaultdict
#77 code review...
r1670
log = logging.getLogger(__name__)
class ChangesetCommentsModel(BaseModel):
code refactoring
r1675 def create(self, text, repo_id, user_id, revision, f_path=None,
#77 code review...
r1670 line_no=None):
"""
Creates new comment for changeset
:param text:
:param repo_id:
:param user_id:
code refactoring
r1675 :param revision:
#77 code review...
r1670 :param f_path:
:param line_no:
"""
#71 code-review...
r1677 if text:
comment = ChangesetComment()
comment.repo_id = repo_id
comment.user_id = user_id
comment.revision = revision
comment.text = text
comment.f_path = f_path
comment.line_no = line_no
#77 code review...
r1670
#71 code-review...
r1677 self.sa.add(comment)
self.sa.commit()
return comment
#77 code review...
r1670
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
code refactoring
r1675
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()
#71 code-review...
r1677 def get_inline_comments(self, repo_id, revision):
code refactoring
r1675 comments = self.sa.query(ChangesetComment)\
.filter(ChangesetComment.repo_id == repo_id)\
fixes inline comments double entries
r1681 .filter(ChangesetComment.revision == revision)\
.filter(ChangesetComment.line_no != None)\
.filter(ChangesetComment.f_path != None).all()
#71 code-review...
r1677
paths = defaultdict(lambda:defaultdict(list))
code refactoring
r1675
for co in comments:
#71 code-review...
r1677 paths[co.f_path][co.line_no].append(co)
return paths.items()