kallithea Changeset - aba28699ec41

Changeset - aba28699ec41

Parent rev.

Child rev.

[Not reviewed]

default

0 2 0

Mads Kiilerich - 11 years ago 2014-08-01 20:28:42
madski@unity3d.com

pull requests: make it possible to add comments to closed PRs

You can close a PR but you cannot close the discussion of it!

2 files changed with 6 insertions and 11 deletions:

kallithea/controllers/pullrequests.py

kallithea/templates/pullrequests/pullrequest_show.html

0 comments (0 inline, 0 general)

kallithea/controllers/pullrequests.py

➞

Show inline comments

@@ @@ -631,14 +631,13 @@ class PullrequestsController(BaseRepoCon @@
         # pull_requests repo_name we opened it against
         # ie. other_repo must match
         if repo_name != c.pull_request.other_repo.repo_name:
             raise HTTPNotFound
         # load compare data into template context
         enable_comments = not c.pull_request.is_closed()
         self._load_compare_data(c.pull_request, enable_comments=enable_comments)
         self._load_compare_data(c.pull_request, enable_comments=True)
         # inline comments
         c.inline_cnt = 0
         c.inline_comments = cc_model.get_inline_comments(
                                 c.db_repo.repo_id,
                                 pull_request=pull_request_id)
@@ @@ -665,14 +664,12 @@ class PullrequestsController(BaseRepoCon @@
     @NotAnonymous()
     @HasRepoPermissionAnyDecorator('repository.read', 'repository.write',
                                    'repository.admin')
     @jsonify
     def comment(self, repo_name, pull_request_id):
         pull_request = PullRequest.get_or_404(pull_request_id)
         if pull_request.is_closed():
             raise HTTPForbidden()
         status = request.POST.get('changeset_status')
         text = request.POST.get('text')
         close_pr = request.POST.get('save_close')
         allowed_to_change_status = self._get_is_allowed_change_status(pull_request)

kallithea/templates/pullrequests/pullrequest_show.html

➞

Show inline comments

@@ @@ -318,19 +318,17 @@ ${self.repo_context_bar('showpullrequest @@
     <%namespace name="comment" file="/changeset/changeset_file_comment.html"/>
     ${comment.comment_inline_form()}
     ## render comments and inlines
     ${comment.generate_comments()}
     % if not c.pull_request.is_closed():
       ## main comment form and it status
       ${comment.comments(h.url('pullrequest_comment', repo_name=c.repo_name,
                                 pull_request_id=c.pull_request.pull_request_id),
                          c.current_voting_result,
                          is_pr=True, change_status=c.allowed_to_change_status)}
     %endif
     ## main comment form and it status
     ${comment.comments(h.url('pullrequest_comment', repo_name=c.repo_name,
                               pull_request_id=c.pull_request.pull_request_id),
                        c.current_voting_result,
                        is_pr=True, change_status=c.allowed_to_change_status)}
     <script type="text/javascript">
       $(document).ready(function(){
           PullRequestAutoComplete('user', 'reviewers_container', _USERS_AC_DATA, _GROUPS_AC_DATA);
           YUE.on(YUQ('.show-inline-comments'),'change',function(e){

0 comments (0 inline, 0 general)