Changeset - 068ca0afcf9f
Parent rev.
Child rev.
[Not reviewed]
default
0 2 0
Mads Kiilerich - 11 years ago 2014-07-18 18:47:02
madski@unity3d.com
pull requests: allow closing of PRs in all states - undo #677

There can be reasons to close a PR without approving or rejecting it -
especially when approving or rejecting a PR overwrites the "review status" of
all changesets in it.

If some code for some reason is interested in PRs that has been closed as
approved or rejected then that is what they should look for ... even though
that is very hard with the current data model.
2 files changed with 2 insertions and 27 deletions:
kallithea/controllers/pullrequests.py
5
kallithea/templates/changeset/changeset_file_comment.html
2
22
0 comments (0 inline, 0 general)
kallithea/controllers/pullrequests.py
➞
Show inline comments
 
@@ -491,142 +491,137 @@ class PullrequestsController(BaseRepoCon
 
        for st in _cs_statuses:
 
            cs_statuses[st.author.username] += [st]
 

			




	
	
	
		
 
        c.pull_request_reviewers = []

			




	
	
	
		
 
        c.pull_request_pending_reviewers = []

			




	
	
	
		
 
        for o in c.pull_request.reviewers:

			




	
	
	
		
 
            st = cs_statuses.get(o.user.username, None)

			




	
	
	
		
 
            if st:

			




	
	
	
		
 
                sorter = lambda k: k.version

			




	
	
	
		
 
                st = [(x, list(y)[0])

			




	
	
	
		
 
                      for x, y in (groupby(sorted(st, key=sorter), sorter))]

			




	
	
	
		
 
            else:

			




	
	
	
		
 
                c.pull_request_pending_reviewers.append(o.user)

			




	
	
	
		
 
            c.pull_request_reviewers.append([o.user, st])

			




	
	
	
		
 

			




	
	
	
		
 
        # 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)

			




	
	
	
		
 

			




	
	
	
		
 
        # inline comments

			




	
	
	
		
 
        c.inline_cnt = 0

			




	
	
	
		
 
        c.inline_comments = cc_model.get_inline_comments(

			




	
	
	
		
 
                                c.db_repo.repo_id,

			




	
	
	
		
 
                                pull_request=pull_request_id)

			




	
	
	
		
 
        # count inline comments

			




	
	
	
		
 
        for __, lines in c.inline_comments:

			




	
	
	
		
 
            for comments in lines.values():

			




	
	
	
		
 
                c.inline_cnt += len(comments)

			




	
	
	
		
 
        # comments

			




	
	
	
		
 
        c.comments = cc_model.get_comments(c.db_repo.repo_id,

			




	
	
	
		
 
                                           pull_request=pull_request_id)

			




	
	
	
		
 

			




	
	
	
		
 
        # (badly named) pull-request status calculation based on reviewer votes

			




	
	
	
		
 
        c.current_changeset_status = cs_model.calculate_status(

			




	
	
	
		
 
                                        c.pull_request_reviewers,

			




	
	
	
		
 
                                         )

			




	
	
	
		
 
        c.changeset_statuses = ChangesetStatus.STATUSES

			




	
	
	
		
 

			




	
	
	
		
 
        c.as_form = False

			




	
	
	
		
 
        c.ancestor = None # there is one - but right here we don't know which

			




	
	
	
		
 
        return render('/pullrequests/pullrequest_show.html')

			




	
	
	
		
 

			




	
	
	
		
 
    @LoginRequired()

			




	
	
	
		
 
    @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)

			




	
	
	
		
 
        if status and allowed_to_change_status:

			




	
	
	
		
 
            _def = (_('Status change -> %s')

			




	
	
	
		
 
                            % ChangesetStatus.get_status_lbl(status))

			




	
	
	
		
 
            if close_pr:

			




	
	
	
		
 
                _def = _('Closing with') + ' ' + _def

			




	
	
	
		
 
            text = text or _def

			




	
	
	
		
 
        comm = ChangesetCommentsModel().create(

			




	
	
	
		
 
            text=text,

			




	
	
	
		
 
            repo=c.db_repo.repo_id,

			




	
	
	
		
 
            user=c.authuser.user_id,

			




	
	
	
		
 
            pull_request=pull_request_id,

			




	
	
	
		
 
            f_path=request.POST.get('f_path'),

			




	
	
	
		
 
            line_no=request.POST.get('line'),

			




	
	
	
		
 
            status_change=(ChangesetStatus.get_status_lbl(status)

			




	
	
	
		
 
                           if status and allowed_to_change_status else None),

			




	
	
	
		
 
            closing_pr=close_pr

			




	
	
	
		
 
        )

			




	
	
	
		
 

			




	
	
	
		
 
        action_logger(self.authuser,

			




	
	
	
		
 
                      'user_commented_pull_request:%s' % pull_request_id,

			




	
	
	
		
 
                      c.db_repo, self.ip_addr, self.sa)

			




	
	
	
		
 

			




	
	
	
		
 
        if allowed_to_change_status:

			




	
	
	
		
 
            # get status if set !

			




	
	
	
		
 
            if status:

			




	
	
	
		
 
                ChangesetStatusModel().set_status(

			




	
	
	
		
 
                    c.db_repo.repo_id,

			




	
	
	
		
 
                    status,

			




	
	
	
		
 
                    c.authuser.user_id,

			




	
	
	
		
 
                    comm,

			




	
	
	
		
 
                    pull_request=pull_request_id

			




	
	
	
		
 
                )

			




	
	
	
		
 

			




	
	
	
		
 
            if close_pr:

			




	
	
	
		
 
                if status in ['rejected', 'approved']:

			




	
	
	
		
 
                    PullRequestModel().close_pull_request(pull_request_id)

			




	
	
	
		
 
                    action_logger(self.authuser,

			




	
	
	
		
 
                              'user_closed_pull_request:%s' % pull_request_id,

			




	
	
	
		
 
                              c.db_repo, self.ip_addr, self.sa)

			




	
	
	
		
 
                else:

			




	
	
	
		
 
                    h.flash(_('Closing pull request on other statuses than '

			




	
	
	
		
 
                              'rejected or approved forbidden'),

			




	
	
	
		
 
                            category='warning')

			




	
	
	
		
 

			




	
	
	
		
 
        Session().commit()

			




	
	
	
		
 

			




	
	
	
		
 
        if not request.environ.get('HTTP_X_PARTIAL_XHR'):

			




	
	
	
		
 
            return redirect(h.url('pullrequest_show', repo_name=repo_name,

			




	
	
	
		
 
                                  pull_request_id=pull_request_id))

			




	
	
	
		
 

			




	
	
	
		
 
        data = {

			




	
	
	
		
 
           'target_id': h.safeid(h.safe_unicode(request.POST.get('f_path'))),

			




	
	
	
		
 
        }

			




	
	
	
		
 
        if comm:

			




	
	
	
		
 
            c.co = comm

			




	
	
	
		
 
            data.update(comm.get_dict())

			




	
	
	
		
 
            data.update({'rendered_text':

			




	
	
	
		
 
                         render('changeset/changeset_comment_block.html')})

			




	
	
	
		
 

			




	
	
	
		
 
        return data

			




	
	
	
		
 

			




	
	
	
		
 
    @LoginRequired()

			




	
	
	
		
 
    @NotAnonymous()

			




	
	
	
		
 
    @HasRepoPermissionAnyDecorator('repository.read', 'repository.write',

			




	
	
	
		
 
                                   'repository.admin')

			




	
	
	
		
 
    @jsonify

			




	
	
	
		
 
    def delete_comment(self, repo_name, comment_id):

			




	
	
	
		
 
        co = ChangesetComment.get(comment_id)

			




	
	
	
		
 
        if co.pull_request.is_closed():

			




	
	
	
		
 
            #don't allow deleting comments on closed pull request

			




	
	
	
		
 
            raise HTTPForbidden()

			




	
	
	
		
 

			




	
	
	
		
 
        owner = co.author.user_id == c.authuser.user_id

			




	
	
	
		
 
        repo_admin = h.HasRepoPermissionAny('repository.admin')(c.repo_name)

			




	
	
	
		
 
        if h.HasPermissionAny('hg.admin') or repo_admin or owner:

			




	
	
	
		
 
            ChangesetCommentsModel().delete(comment=co)

			




	
	
	
		
 
            Session().commit()

			




	
	
	
		
 
            return True

			




	
	
	
		
 
        else:

			




	
	
	
		
 
            raise HTTPForbidden()

			




        

    


    
    

    

        

                

                    kallithea/templates/changeset/changeset_file_comment.html
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -78,169 +78,149 @@

			




	
	
	
		
 
         <div class="comment-help">

			




	
	
	
		
 
              ${_('Comment preview')}

			




	
	
	
		
 
            <div id="edit-btn_{1}" class="edit-btn btn btn-mini">${_('Edit')}</div>

			




	
	
	
		
 
          </div>

			




	
	
	
		
 
          <div id="preview-box_{1}" class="preview-box"></div>

			




	
	
	
		
 
      </div>

			




	
	
	
		
 
      <div class="comment-button">

			




	
	
	
		
 
      <div class="submitting-overlay">${_('Submitting ...')}</div>

			




	
	
	
		
 
      <input type="hidden" name="f_path" value="{0}">

			




	
	
	
		
 
      <input type="hidden" name="line" value="{1}">

			




	
	
	
		
 
      ${h.submit('save', _('Comment'), class_='btn btn-small save-inline-form')}

			




	
	
	
		
 
      ${h.reset('hide-inline-form', _('Cancel'), class_='btn btn-small hide-inline-form')}

			




	
	
	
		
 
      </div>

			




	
	
	
		
 
      ${h.end_form()}

			




	
	
	
		
 
  %else:

			




	
	
	
		
 
      ${h.form('')}

			




	
	
	
		
 
      <div class="clearfix">

			




	
	
	
		
 
          <div class="comment-help">

			




	
	
	
		
 
            ${_('You need to be logged in to comment.')} <a href="${h.url('login_home',came_from=h.url.current())}">${_('Login now')}</a>

			




	
	
	
		
 
          </div>

			




	
	
	
		
 
      </div>

			




	
	
	
		
 
      <div class="comment-button">

			




	
	
	
		
 
      ${h.reset('hide-inline-form', _('Hide'), class_='btn btn-small hide-inline-form')}

			




	
	
	
		
 
      </div>

			




	
	
	
		
 
      ${h.end_form()}

			




	
	
	
		
 
  %endif

			




	
	
	
		
 
  </div>

			




	
	
	
		
 
</div>

			




	
	
	
		
 
</%def>

			




	
	
	
		
 

			




	
	
	
		
 

			




	
	
	
		
 
## generates inlines taken from c.comments var

			




	
	
	
		
 
<%def name="inlines()">

			




	
	
	
		
 
    <div class="comments-number">${ungettext("%d comment", "%d comments", len(c.comments)) % len(c.comments)} ${ungettext("(%d inline)", "(%d inline)", c.inline_cnt) % c.inline_cnt}</div>

			




	
	
	
		
 
    %for path, lines in c.inline_comments:

			




	
	
	
		
 
        % for line,comments in lines.iteritems():

			




	
	
	
		
 
            <div style="display:none" class="inline-comment-placeholder" path="${path}" target_id="${h.safeid(h.safe_unicode(path))}">

			




	
	
	
		
 
            %for co in comments:

			




	
	
	
		
 
                ${comment_block(co)}

			




	
	
	
		
 
            %endfor

			




	
	
	
		
 
            </div>

			




	
	
	
		
 
        %endfor

			




	
	
	
		
 
    %endfor

			




	
	
	
		
 

			




	
	
	
		
 
</%def>

			




	
	
	
		
 

			




	
	
	
		
 
## generate inline comments and the main ones

			




	
	
	
		
 
<%def name="generate_comments()">

			




	
	
	
		
 
<div class="comments">

			




	
	
	
		
 
    <div id="inline-comments-container">

			




	
	
	
		
 
    ## generate inlines for this changeset

			




	
	
	
		
 
     ${inlines()}

			




	
	
	
		
 
    </div>

			




	
	
	
		
 

			




	
	
	
		
 
    %for co in c.comments:

			




	
	
	
		
 
        <div id="comment-tr-${co.comment_id}">

			




	
	
	
		
 
          ${comment_block(co)}

			




	
	
	
		
 
        </div>

			




	
	
	
		
 
    %endfor

			




	
	
	
		
 
</div>

			




	
	
	
		
 
</%def>

			




	
	
	
		
 

			




	
	
	
		
 
## MAIN COMMENT FORM

			




	
	
	
		
 
<%def name="comments(post_url, cur_status, is_pr=False, change_status=True)">

			




	
	
	
		
 

			




	
	
	
		
 
<div class="comments">

			




	
	
	
		
 
    %if c.authuser.username != 'default':

			




	
	
	
		
 
    <div class="comment-form ac">

			




	
	
	
		
 
        ${h.form(post_url)}

			




	
	
	
		
 
        <div id="edit-container" class="clearfix">

			




	
	
	
		
 
            <div class="comment-help">

			




	
	
	
		
 
                ${(_('Comments parsed using %s syntax with %s support.') % (('<a href="%s">RST</a>' % h.url('rst_help')),

			




	
	
	
		
 
                  '<span style="color:#577632" class="tooltip" title="%s">@mention</span>' %

			




	
	
	
		
 
                  _('Use @username inside this text to send notification to this Kallithea user')))|n}

			




	
	
	
		
 
                <div id="preview-btn" class="preview-btn btn btn-mini">${_('Preview')}</div>

			




	
	
	
		
 
            </div>

			




	
	
	
		
 
            <div class="mentions-container" id="mentions_container"></div>

			




	
	
	
		
 
            ${h.textarea('text', class_="comment-block-ta")}

			




	
	
	
		
 
            %if change_status:

			




	
	
	
		
 
              <div id="status_block_container" class="status-block">

			




	
	
	
		
 
                %if is_pr:

			




	
	
	
		
 
                  ${_('Vote for pull request status')}:

			




	
	
	
		
 
                %else:

			




	
	
	
		
 
                  ${_('Set changeset status')}:

			




	
	
	
		
 
                %endif

			




	
	
	
		
 
                <input type="radio" class="status_change_radio" name="changeset_status" id="changeset_status_unchanged" value="" checked="checked" />

			




	
	
	
		
 
                <label for="changeset_status_unchanged">

			




	
	
	
		
 
                  ${_('No change')}

			




	
	
	
		
 
                </label>

			




	
	
	
		
 
                %for status,lbl in c.changeset_statuses:

			




	
	
	
		
 
                    <span style="margin-left: 15px;">

			




	
	
	
		
 
                        <input type="radio" class="status_change_radio" name="changeset_status" id="${status}" value="${status}">

			




	
	
	
		
 
                        <label for="${status}"><img src="${h.url('/images/icons/flag_status_%s.png' % status)}" />${lbl}</label>

			




	
	
	
		
 
                    </span>

			




	
	
	
		
 
                %endfor

			




	
	
	
		
 
                %if is_pr and change_status:

			




	
	
	
		
 
                <input id="save_close" type="checkbox" name="save_close" disabled="${'1' if cur_status in ['not_reviewed','under_review'] else ''}">

			




	
	
	
		
 
                <label id="save_close_label" for="save_close" class="${'disabled' if cur_status in ['not_reviewed','under_review'] else ''}">${_("Close (when approved or rejected)")}</label>

			




	
	
	
		
 
                <input id="save_close" type="checkbox" name="save_close">

			




	
	
	
		
 
                <label id="save_close_label" for="save_close">${_("Close")}</label>

			




	
	
	
		
 
                %endif

			




	
	
	
		
 
              </div>

			




	
	
	
		
 
            %endif

			




	
	
	
		
 
        </div>

			




	
	
	
		
 

			




	
	
	
		
 
        <div id="preview-container" class="clearfix" style="display:none">

			




	
	
	
		
 
           <div class="comment-help">

			




	
	
	
		
 
                ${_('Comment preview')}

			




	
	
	
		
 
              <div id="edit-btn" class="edit-btn btn btn-mini">${_('Edit')}</div>

			




	
	
	
		
 
            </div>

			




	
	
	
		
 
            <div id="preview-box" class="preview-box"></div>

			




	
	
	
		
 
        </div>

			




	
	
	
		
 

			




	
	
	
		
 
        <div class="comment-button">

			




	
	
	
		
 
        ${h.submit('save', _('Comment'), class_="btn")}

			




	
	
	
		
 
        </div>

			




	
	
	
		
 
        ${h.end_form()}

			




	
	
	
		
 
    </div>

			




	
	
	
		
 
    %endif

			




	
	
	
		
 
</div>

			




	
	
	
		
 

			




	
	
	
		
 
<script>

			




	
	
	
		
 

			




	
	
	
		
 
YUE.onDOMReady(function () {

			




	
	
	
		
 
   MentionsAutoComplete('text', 'mentions_container', _USERS_AC_DATA, _GROUPS_AC_DATA);

			




	
	
	
		
 

			




	
	
	
		
 
   var set_close_button_state = function(cur_val){

			




	
	
	
		
 
     %if is_pr and change_status:

			




	
	
	
		
 
       if (cur_val == 'approved' || cur_val == 'rejected') {

			




	
	
	
		
 
           YUD.removeClass('save_close_label', 'disabled');

			




	
	
	
		
 
           YUD.get('save_close').disabled = false;

			




	
	
	
		
 
       }else{

			




	
	
	
		
 
           YUD.addClass('save_close_label', 'disabled');

			




	
	
	
		
 
           YUD.get('save_close').disabled = true;

			




	
	
	
		
 
           YUD.get('save_close').checked = false;

			




	
	
	
		
 
       }

			




	
	
	
		
 
     %endif

			




	
	
	
		
 
   }

			




	
	
	
		
 
   YUE.on(YUQ('.status_change_radio'), 'change',function(e){

			




	
	
	
		
 
       var val = e.currentTarget.value;

			




	
	
	
		
 
       set_close_button_state(val);

			




	
	
	
		
 
   })

			




	
	
	
		
 
   // if currect checked status is approved or rejected we should unlock the close button

			




	
	
	
		
 
   var cur_val = YUQ('.status_change_radio[checked]')[0].value;

			




	
	
	
		
 
   set_close_button_state(cur_val)

			




	
	
	
		
 

			




	
	
	
		
 
   YUE.on('preview-btn', 'click', function(e){

			




	
	
	
		
 
       var _text = YUD.get('text').value;

			




	
	
	
		
 
       if(!_text){

			




	
	
	
		
 
           return

			




	
	
	
		
 
       }

			




	
	
	
		
 
       var post_data = {'text': _text};

			




	
	
	
		
 
       YUD.addClass('preview-box', 'unloaded');

			




	
	
	
		
 
       YUD.get('preview-box').innerHTML = _TM['Loading ...'];

			




	
	
	
		
 
       YUD.setStyle('edit-container', 'display', 'none');

			




	
	
	
		
 
       YUD.setStyle('preview-container', 'display', '');

			




	
	
	
		
 

			




	
	
	
		
 
       var url = pyroutes.url('changeset_comment_preview', {'repo_name': '${c.repo_name}'});

			




	
	
	
		
 
       ajaxPOST(url,post_data,function(o){

			




	
	
	
		
 
           YUD.get('preview-box').innerHTML = o.responseText;

			




	
	
	
		
 
           YUD.removeClass('preview-box', 'unloaded');

			




	
	
	
		
 
       })

			




	
	
	
		
 
   })

			




	
	
	
		
 
   YUE.on('edit-btn', 'click', function(e){

			




	
	
	
		
 
       YUD.setStyle('edit-container', 'display', '');

			




	
	
	
		
 
       YUD.setStyle('preview-container', 'display', 'none');

			




	
	
	
		
 
   })

			




	
	
	
		
 

			




	
	
	
		
 
});

			




	
	
	
		
 
</script>

			




	
	
	
		
 
</%def>

			




        

    



    


    



    



      

      





    
    0 comments (0 inline, 0 general)
    





    


  

  







  


    




    








    
        
    
    
        This site is powered by
            Kallithea 0.7.0,
        which is
        © 2010–2025 by various authors & licensed under GPLv3.