kallithea Changeset - 901a5f2f3530

Changeset - 901a5f2f3530

Parent rev.

Child rev.

[Not reviewed]

default

0 2 0

Thomas De Schampheleire - 7 years ago 2018-11-22 21:01:54
thomas.de_schampheleire@nokia.com

controllers: remove pr_comment flag in delete_cs_pr_comment

A separate comment is not really needed as we can check co.pull_request.

Suggested by Mads Killerich.

2 files changed with 4 insertions and 4 deletions:

kallithea/controllers/changeset.py

kallithea/controllers/pullrequests.py

0 comments (0 inline, 0 general)

kallithea/controllers/changeset.py

➞

Show inline comments

@@ @@ -244,29 +244,29 @@ def create_cs_pr_comment(repo_name, revi @@
     data = {
        'target_id': h.safeid(h.safe_unicode(request.POST.get('f_path'))),
+    }
     if comment is not None:
         c.comment = comment
         data.update(comment.get_dict())
         data.update({'rendered_text':
                      render('changeset/changeset_comment_block.html')})
     return data
-def delete_cs_pr_comment(repo_name, comment_id, pr_comment=False):
 def delete_cs_pr_comment(repo_name, comment_id):
     co = ChangesetComment.get_or_404(comment_id)
     if co.repo.repo_name != repo_name:
         raise HTTPNotFound()
-    if pr_comment and co.pull_request.is_closed():
+    if co.pull_request and co.pull_request.is_closed():
         # don't allow deleting comments on closed pull request
         raise HTTPForbidden()
     owner = co.author_id == request.authuser.user_id
     repo_admin = h.HasRepoPermissionLevel('admin')(repo_name)
     if h.HasPermissionAny('hg.admin')() or repo_admin or owner:
         ChangesetCommentsModel().delete(comment=co)
         Session().commit()
         return True
     else:
         raise HTTPForbidden()
@@ @@ -429,25 +429,25 @@ class ChangesetController(BaseRepoContro @@
         return self._index(revision, method='download')
     @LoginRequired()
     @HasRepoPermissionLevelDecorator('read')
     @jsonify
     def comment(self, repo_name, revision):
         return create_cs_pr_comment(repo_name, revision=revision)
     @LoginRequired()
     @HasRepoPermissionLevelDecorator('read')
     @jsonify
     def delete_comment(self, repo_name, comment_id):
-        return delete_cs_pr_comment(repo_name, comment_id, pr_comment=False)
         return delete_cs_pr_comment(repo_name, comment_id)
     @LoginRequired(allow_default_user=True)
     @HasRepoPermissionLevelDecorator('read')
     @jsonify
     def changeset_info(self, repo_name, revision):
         if request.is_xhr:
             try:
                 return c.db_repo_scm_instance.get_changeset(revision)
             except ChangesetDoesNotExistError as e:
                 return EmptyChangeset(message=str(e))
         else:
             raise HTTPBadRequest()

kallithea/controllers/pullrequests.py

➞

Show inline comments

@@ @@ -632,13 +632,13 @@ class PullrequestsController(BaseRepoCon @@
     @HasRepoPermissionLevelDecorator('read')
     @jsonify
     def comment(self, repo_name, pull_request_id):
         pull_request = PullRequest.get_or_404(pull_request_id)
         allowed_to_change_status = self._is_allowed_to_change_status(pull_request)
         return create_cs_pr_comment(repo_name, pull_request=pull_request,
                 allowed_to_change_status=allowed_to_change_status)
     @LoginRequired()
     @HasRepoPermissionLevelDecorator('read')
     @jsonify
     def delete_comment(self, repo_name, comment_id):
-        return delete_cs_pr_comment(repo_name, comment_id, pr_comment=True)
         return delete_cs_pr_comment(repo_name, comment_id)

0 comments (0 inline, 0 general)