kallithea Changeset - 7c487d2678c7

Changeset - 7c487d2678c7

Parent rev.

Child rev.

[Not reviewed]

beta

0 4 0

Marcin Kuzminski - 14 years ago 2011-11-12 16:30:12
marcin@python-works.com

code refactoring

4 files changed with 30 insertions and 12 deletions:

rhodecode/controllers/changeset.py

rhodecode/model/comment.py

rhodecode/model/db.py

rhodecode/templates/changeset/changeset_file_comment.html

0 comments (0 inline, 0 general)

rhodecode/controllers/changeset.py

➞

Show inline comments

@@ @@ -95,21 +95,19 @@ class ChangesetController(BaseRepoContro @@
         c.sum_removed = 0
         c.lines_added = 0
         c.lines_deleted = 0
         c.cut_off = False  # defines if cut off limit is reached
         c.comments = []
         for cs in c.cs_ranges:
             c.comments.extend(ChangesetComment.query()\
                               .filter(ChangesetComment.repo_id == c.rhodecode_db_repo.repo_id)\
                               .filter(ChangesetComment.commit_id == cs.raw_id)\
                               .filter(ChangesetComment.line_no == None)\
                               .filter(ChangesetComment.f_path == None).all())
         # Iterate over ranges (default changeset view is always one changeset)
         for changeset in c.cs_ranges:
             c.comments.extend(ChangesetCommentsModel()\
                               .get_comments(c.rhodecode_db_repo.repo_id,
                                             changeset.raw_id))
             c.changes[changeset.raw_id] = []
             try:
                 changeset_parent = changeset.parents[0]
             except IndexError:
                 changeset_parent = None
@@ @@ -269,13 +267,13 @@ class ChangesetController(BaseRepoContro @@
     def comment(self, repo_name, revision):
         ccmodel = ChangesetCommentsModel()
         ccmodel.create(text=request.POST.get('text'),
                        repo_id=c.rhodecode_db_repo.repo_id,
                        user_id=c.rhodecode_user.user_id,
-                       commit_id=revision, f_path=request.POST.get('f_path'),
+                       revision=revision, f_path=request.POST.get('f_path'),
                        line_no = request.POST.get('line'))
         return redirect(h.url('changeset_home', repo_name=repo_name,
                               revision=revision))
     @jsonify

rhodecode/model/comment.py

➞

Show inline comments

@@ @@ -26,36 +26,37 @@ @@
 import logging
 import traceback
 from rhodecode.model import BaseModel
 from rhodecode.model.db import ChangesetComment
 from sqlalchemy.util.compat import defaultdict
 log = logging.getLogger(__name__)
 class ChangesetCommentsModel(BaseModel):
-    def create(self, text, repo_id, user_id, commit_id, f_path=None,
+    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 commit_id:
+        :param revision:
         :param f_path:
         :param line_no:
         """
         comment = ChangesetComment()
         comment.repo_id = repo_id
         comment.user_id = user_id
-        comment.commit_id = commit_id
+        comment.revision = revision
         comment.text = text
         comment.f_path = f_path
         comment.line_no = line_no
         self.sa.add(comment)
         self.sa.commit()
@@ @@ -68,6 +69,25 @@ class ChangesetCommentsModel(BaseModel): @@
         :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_comments_for_file(self, repo_id, f_path, raw_id):
         comments = self.sa.query(ChangesetComment)\
             .filter(ChangesetComment.repo_id == repo_id)\
             .filter(ChangesetComment.commit_id == raw_id)\
             .filter(ChangesetComment.f_path == f_path).all()
         d = defaultdict(list)
         for co in comments:
             d[co.line_no].append(co)
         return d.items()

rhodecode/model/db.py

➞

Show inline comments

@@ @@ -1097,13 +1097,13 @@ class CacheInvalidation(Base, BaseModel) @@
 class ChangesetComment(Base, BaseModel):
     __tablename__ = 'changeset_comments'
     __table_args__ = ({'extend_existing':True},)
     comment_id = Column('comment_id', Integer(), nullable=False, primary_key=True)
     repo_id = Column('repo_id', Integer(), ForeignKey('repositories.repo_id'), nullable=False)
-    commit_id = Column('commit_id', String(100), nullable=False)
+    revision = Column('revision', String(40), nullable=False)
     line_no = Column('line_no', Integer(), nullable=True)
     f_path = Column('f_path', String(1000), nullable=True)
     user_id = Column('user_id', Integer(), ForeignKey('users.user_id'), nullable=False)
     text = Column('text', String(25000), nullable=False)
     modified_at = Column('modified_at', DateTime(timezone=False), nullable=False, default=datetime.datetime.now)

rhodecode/templates/changeset/changeset_file_comment.html

➞

Show inline comments

@@ @@ -7,13 +7,13 @@ @@
   	<div class="meta">
   		<span class="user">
   			<img src="${h.gravatar_url(co.author.email, 20)}" />
   			${co.author.username}
   		</span>
   		<a href="${h.url.current(anchor='comment-%s' % co.comment_id)}"> ${_('commented on')} </a>
-  		${h.short_id(co.commit_id)}
+  		${h.short_id(co.revision)}
   		%if co.f_path:
   			${_(' in file ')}
   			${co.f_path}:L${co.line_no}
   		%endif
   		<span class="date">
   			${h.age(co.modified_at)}

0 comments (0 inline, 0 general)