kallithea Changeset - b3ddd87f214f

Changeset - b3ddd87f214f

Parent rev.

Child rev.

[Not reviewed]

default

0 2 0

Mads Kiilerich - 10 years ago 2016-01-20 01:47:11
madski@unity3d.com

comments: extract common comment creation functionality for changesets and pullrequests

So far not big but it will grow later ...

2 files changed with 31 insertions and 18 deletions:

kallithea/controllers/changeset.py

kallithea/controllers/pullrequests.py

0 comments (0 inline, 0 general)

kallithea/controllers/changeset.py

➞

Show inline comments

@@ @@ -172,6 +172,24 @@ def _context_url(GET, fileid=None): @@
     return h.link_to(icon, h.url.current(**params), title=lbl, class_='tooltip')
 # Could perhaps be nice to have in the model but is too high level ...
 def create_comment(text, status, f_path, line_no, revision=None, pull_request_id=None, closing_pr=None):
     """Comment functionality shared between changesets and pullrequests"""
     comment = ChangesetCommentsModel().create(
         text=text,
         repo=c.db_repo.repo_id,
         user=c.authuser.user_id,
         revision=revision,
         pull_request=pull_request_id,
         f_path=f_path,
         line_no=line_no,
         status_change=ChangesetStatus.get_status_lbl(status) if status else None,
         closing_pr=closing_pr,
+    )
     return comment
 class ChangesetController(BaseRepoController):
     def __before__(self):
@@ @@ -350,15 +368,12 @@ class ChangesetController(BaseRepoContro @@
         status = request.POST.get('changeset_status')
         text = request.POST.get('text', '').strip()
         c.comment = comment = ChangesetCommentsModel().create(
             text=text,
             repo=c.db_repo.repo_id,
             user=c.authuser.user_id,
         c.comment = create_comment(
             text,
             status,
             revision=revision,
             f_path=request.POST.get('f_path'),
             line_no=request.POST.get('line'),
             status_change=(ChangesetStatus.get_status_lbl(status)
                            if status else None)
+        )
         # get status if set !
@@ @@ -372,7 +387,7 @@ class ChangesetController(BaseRepoContro @@
                     c.db_repo.repo_id,
                     status,
                     c.authuser.user_id,
                     comment,
+                    c.comment,
                     revision=revision,
                     dont_allow_on_closed_pull_request=True
+                )
@@ @@ -396,8 +411,8 @@ class ChangesetController(BaseRepoContro @@
         data = {
            'target_id': h.safeid(h.safe_unicode(request.POST.get('f_path'))),
+        }
         if comment is not None:
             data.update(comment.get_dict())
         if c.comment is not None:
             data.update(c.comment.get_dict())
             data.update({'rendered_text':
                          render('changeset/changeset_comment_block.html')})

kallithea/controllers/pullrequests.py

➞

Show inline comments

@@ @@ -56,7 +56,8 @@ from kallithea.model.comment import Chan @@
 from kallithea.model.changeset_status import ChangesetStatusModel
 from kallithea.model.forms import PullRequestForm, PullRequestPostForm
 from kallithea.lib.utils2 import safe_int
 from kallithea.controllers.changeset import _ignorews_url, _context_url
 from kallithea.controllers.changeset import _ignorews_url, _context_url, \
     create_comment
 from kallithea.controllers.compare import CompareController
 from kallithea.lib.graphmod import graph_data
@@ @@ -726,16 +727,13 @@ class PullrequestsController(BaseRepoCon @@
         if close_pr:
             text = _('Closing.') + '\n' + text
         comment = ChangesetCommentsModel().create(
             text=text,
             repo=c.db_repo.repo_id,
             user=c.authuser.user_id,
             pull_request=pull_request_id,
         comment = create_comment(
             text,
             status,
             pull_request_id=pull_request_id,
             f_path=f_path,
             line_no=line_no,
             status_change=(ChangesetStatus.get_status_lbl(status)
                            if status and allowed_to_change_status else None),
             closing_pr=close_pr
             closing_pr=close_pr,
+        )
         action_logger(self.authuser,

0 comments (0 inline, 0 general)