Changeset - 91492a72b2dc
Parent rev.
Child rev.
[Not reviewed]
beta
0 3 0
Marcin Kuzminski - 13 years ago 2012-12-14 02:27:48
marcin@python-works.com
implements #677: Don't allow to close pull requests when they are under-review state
3 files changed with 19 insertions and 2 deletions:
rhodecode/controllers/pullrequests.py
5
rhodecode/public/css/style.css
4
rhodecode/templates/changeset/changeset_file_comment.html
10
2
0 comments (0 inline, 0 general)
rhodecode/controllers/pullrequests.py
➞
Show inline comments
 
@@ -388,85 +388,90 @@ class PullrequestsController(BaseRepoCon
 
            c.current_changeset_status = cur_status
 
        else:
 
            # changeset(pull-request) status calulation based on reviewers
 
            c.current_changeset_status = cs_model.calculate_status(
 
                                            c.pull_request_reviewers,
 
                                         )
 
        c.changeset_statuses = ChangesetStatus.STATUSES
 

			




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

			




	
	
	
		
 

			




	
	
	
		
 
    @NotAnonymous()

			




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

			




	
	
	
		
 
        change_status = request.POST.get('change_changeset_status')

			




	
	
	
		
 
        text = request.POST.get('text')

			




	
	
	
		
 
        if status and change_status:

			




	
	
	
		
 
            text = text or (_('Status change -> %s')

			




	
	
	
		
 
                            % ChangesetStatus.get_status_lbl(status))

			




	
	
	
		
 
        comm = ChangesetCommentsModel().create(

			




	
	
	
		
 
            text=text,

			




	
	
	
		
 
            repo=c.rhodecode_db_repo.repo_id,

			




	
	
	
		
 
            user=c.rhodecode_user.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 change_status else None)

			




	
	
	
		
 
        )

			




	
	
	
		
 

			




	
	
	
		
 
        # get status if set !

			




	
	
	
		
 
        if status and change_status:

			




	
	
	
		
 
            ChangesetStatusModel().set_status(

			




	
	
	
		
 
                c.rhodecode_db_repo.repo_id,

			




	
	
	
		
 
                status,

			




	
	
	
		
 
                c.rhodecode_user.user_id,

			




	
	
	
		
 
                comm,

			




	
	
	
		
 
                pull_request=pull_request_id

			




	
	
	
		
 
            )

			




	
	
	
		
 
        action_logger(self.rhodecode_user,

			




	
	
	
		
 
                      'user_commented_pull_request:%s' % pull_request_id,

			




	
	
	
		
 
                      c.rhodecode_db_repo, self.ip_addr, self.sa)

			




	
	
	
		
 

			




	
	
	
		
 
        if request.POST.get('save_close'):

			




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

			




	
	
	
		
 
            PullRequestModel().close_pull_request(pull_request_id)

			




	
	
	
		
 
            action_logger(self.rhodecode_user,

			




	
	
	
		
 
                      'user_closed_pull_request:%s' % pull_request_id,

			




	
	
	
		
 
                      c.rhodecode_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

			




	
	
	
		
 

			




	
	
	
		
 
    @NotAnonymous()

			




	
	
	
		
 
    @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 = lambda: co.author.user_id == c.rhodecode_user.user_id

			




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

			




	
	
	
		
 
            ChangesetCommentsModel().delete(comment=co)

			




	
	
	
		
 
            Session().commit()

			




	
	
	
		
 
            return True

			




	
	
	
		
 
        else:

			




	
	
	
		
 
            raise HTTPForbidden()

			




        

    


    
    

    

        

                

                    rhodecode/public/css/style.css
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -3574,96 +3574,100 @@ div.gravatar img {

			




	
	
	
		
 
.ui-btn.red{

			




	
	
	
		
 
  color:#fff;

			




	
	
	
		
 
  background-color: #c43c35;

			




	
	
	
		
 
  background-repeat: repeat-x;

			




	
	
	
		
 
  background-image: -khtml-gradient(linear, left top, left bottom, from(#ee5f5b), to(#c43c35));

			




	
	
	
		
 
  background-image: -moz-linear-gradient(top, #ee5f5b, #c43c35);

			




	
	
	
		
 
  background-image: -ms-linear-gradient(top, #ee5f5b, #c43c35);

			




	
	
	
		
 
  background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #ee5f5b), color-stop(100%, #c43c35));

			




	
	
	
		
 
  background-image: -webkit-linear-gradient(top, #ee5f5b, #c43c35);

			




	
	
	
		
 
  background-image: -o-linear-gradient(top, #ee5f5b, #c43c35);

			




	
	
	
		
 
  background-image: linear-gradient(top, #ee5f5b, #c43c35);

			




	
	
	
		
 
  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ee5f5b', endColorstr='#c43c35', GradientType=0);

			




	
	
	
		
 
  border-color: #c43c35 #c43c35 #882a25;

			




	
	
	
		
 
  border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 

			




	
	
	
		
 
.ui-btn.blue{

			




	
	
	
		
 
  color:#fff;

			




	
	
	
		
 
  background-color: #339bb9;

			




	
	
	
		
 
  background-repeat: repeat-x;

			




	
	
	
		
 
  background-image: -khtml-gradient(linear, left top, left bottom, from(#5bc0de), to(#339bb9));

			




	
	
	
		
 
  background-image: -moz-linear-gradient(top, #5bc0de, #339bb9);

			




	
	
	
		
 
  background-image: -ms-linear-gradient(top, #5bc0de, #339bb9);

			




	
	
	
		
 
  background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #5bc0de), color-stop(100%, #339bb9));

			




	
	
	
		
 
  background-image: -webkit-linear-gradient(top, #5bc0de, #339bb9);

			




	
	
	
		
 
  background-image: -o-linear-gradient(top, #5bc0de, #339bb9);

			




	
	
	
		
 
  background-image: linear-gradient(top, #5bc0de, #339bb9);

			




	
	
	
		
 
  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#5bc0de', endColorstr='#339bb9', GradientType=0);

			




	
	
	
		
 
  border-color: #339bb9 #339bb9 #22697d;

			




	
	
	
		
 
  border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);    

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
.ui-btn.green{

			




	
	
	
		
 
  background-color: #57a957;

			




	
	
	
		
 
  background-repeat: repeat-x;

			




	
	
	
		
 
  background-image: -khtml-gradient(linear, left top, left bottom, from(#62c462), to(#57a957));

			




	
	
	
		
 
  background-image: -moz-linear-gradient(top, #62c462, #57a957);

			




	
	
	
		
 
  background-image: -ms-linear-gradient(top, #62c462, #57a957);

			




	
	
	
		
 
  background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #62c462), color-stop(100%, #57a957));

			




	
	
	
		
 
  background-image: -webkit-linear-gradient(top, #62c462, #57a957);

			




	
	
	
		
 
  background-image: -o-linear-gradient(top, #62c462, #57a957);

			




	
	
	
		
 
  background-image: linear-gradient(top, #62c462, #57a957);

			




	
	
	
		
 
  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#62c462', endColorstr='#57a957', GradientType=0);

			




	
	
	
		
 
  border-color: #57a957 #57a957 #3d773d;

			




	
	
	
		
 
  border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);	

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
.ui-btn.blue.hidden{

			




	
	
	
		
 
	display: none;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
.ui-btn.active{

			




	
	
	
		
 
    font-weight: bold;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
ins,div.options a:hover {

			




	
	
	
		
 
	text-decoration: none;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
img,

			




	
	
	
		
 
#header #header-inner #quick li a:hover span.normal,

			




	
	
	
		
 
#header #header-inner #quick li ul li.last,

			




	
	
	
		
 
#content div.box div.form div.fields div.field div.textarea table td table td a,

			




	
	
	
		
 
#clone_url,

			




	
	
	
		
 
#clone_url_id

			




	
	
	
		
 
{

			




	
	
	
		
 
	border: none;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
img.icon,.right .merge img {

			




	
	
	
		
 
	vertical-align: bottom;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
#header ul#logged-user,#content div.box div.title ul.links,

			




	
	
	
		
 
#content div.box div.message div.dismiss,

			




	
	
	
		
 
#content div.box div.traffic div.legend ul

			




	
	
	
		
 
	{

			




	
	
	
		
 
	float: right;

			




	
	
	
		
 
	margin: 0;

			




	
	
	
		
 
	padding: 0;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
#header #header-inner #home,#header #header-inner #logo,

			




	
	
	
		
 
#content div.box ul.left,#content div.box ol.left,

			




	
	
	
		
 
#content div.box div.pagination-left,div#commit_history,

			




	
	
	
		
 
div#legend_data,div#legend_container,div#legend_choices

			




	
	
	
		
 
	{

			




	
	
	
		
 
	float: left;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
#header #header-inner #quick li:hover ul ul,

			




	
	
	
		
 
#header #header-inner #quick li:hover ul ul ul,

			




	
	
	
		
 
#header #header-inner #quick li:hover ul ul ul ul,

			




	
	
	
		
 
#content #left #menu ul.closed,#content #left #menu li ul.collapsed,.yui-tt-shadow

			




	
	
	
		
 
	{

			




	
	
	
		
 
	display: none;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
#header #header-inner #quick li:hover ul,#header #header-inner #quick li li:hover ul,#header #header-inner #quick li li li:hover ul,#header #header-inner #quick li li li li:hover ul,#content #left #menu ul.opened,#content #left #menu li ul.expanded

			




        

    


    
    

    

        

                

                    rhodecode/templates/changeset/changeset_file_comment.html
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -82,83 +82,91 @@

			




	
	
	
		
 
    <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, close_btn=False)">

			




	
	
	
		
 

			




	
	
	
		
 
<div class="comments">

			




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

			




	
	
	
		
 
    <div class="comment-form ac">

			




	
	
	
		
 
        ${h.form(post_url)}

			




	
	
	
		
 
        <strong>${_('Leave a comment')}</strong>

			




	
	
	
		
 
        <div 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:#003367" class="tooltip" title="%s">@mention</span>' %

			




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

			




	
	
	
		
 
                | <label for="show_changeset_status_box" class="tooltip" title="${_('Check this to change current status of code-review for this changeset')}"> ${_('change status')}</label>

			




	
	
	
		
 
                  <input style="vertical-align: bottom;margin-bottom:-2px" id="show_changeset_status_box" type="checkbox" name="change_changeset_status" />

			




	
	
	
		
 
            </div>

			




	
	
	
		
 
            <div id="status_block_container" class="status-block" style="display:none">

			




	
	
	
		
 
                %for status,lbl in c.changeset_statuses:

			




	
	
	
		
 
                    <div class="">

			




	
	
	
		
 
                        <img src="${h.url('/images/icons/flag_status_%s.png' % status)}" /> <input ${'checked="checked"' if status == cur_status else ''}" type="radio" name="changeset_status" id="${status}" value="${status}"> 

			




	
	
	
		
 
                        <img src="${h.url('/images/icons/flag_status_%s.png' % status)}" /> <input ${'checked="checked"' if status == cur_status else ''}" type="radio" class="status_change_radio" name="changeset_status" id="${status}" value="${status}"> 

			




	
	
	
		
 
                        <label for="${status}">${lbl}</label>

			




	
	
	
		
 
                    </div>

			




	
	
	
		
 
                %endfor

			




	
	
	
		
 
            </div>

			




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

			




	
	
	
		
 
             ${h.textarea('text')}

			




	
	
	
		
 
        </div>

			




	
	
	
		
 
        <div class="comment-button">

			




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

			




	
	
	
		
 
        %if close_btn:

			




	
	
	
		
 
           ${h.submit('save_close', _('Comment and close'), class_='ui-btn blue large')}

			




	
	
	
		
 
           ${h.submit('save_close', _('Comment and close'), class_='ui-btn blue large %s' % 'hidden' if cur_status in ['not_reviewd','under_review'] else '')}

			




	
	
	
		
 
        %endif

			




	
	
	
		
 
        </div>

			




	
	
	
		
 
        ${h.end_form()}

			




	
	
	
		
 
    </div>

			




	
	
	
		
 
    %endif

			




	
	
	
		
 
</div>

			




	
	
	
		
 
<script>

			




	
	
	
		
 
YUE.onDOMReady(function () {

			




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

			




	
	
	
		
 

			




	
	
	
		
 
   // changeset status box listener

			




	
	
	
		
 
   YUE.on(YUD.get('show_changeset_status_box'),'change',function(e){

			




	
	
	
		
 
       if(e.currentTarget.checked){

			




	
	
	
		
 
           YUD.setStyle('status_block_container','display','');

			




	
	
	
		
 
       }

			




	
	
	
		
 
       else{

			




	
	
	
		
 
           YUD.setStyle('status_block_container','display','none');

			




	
	
	
		
 
       }

			




	
	
	
		
 
   })

			




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

			




	
	
	
		
 
	   var val = e.currentTarget.value;

			




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

			




	
	
	
		
 
		   YUD.removeClass('save_close', 'hidden');

			




	
	
	
		
 
	   }else{

			




	
	
	
		
 
		   YUD.addClass('save_close', 'hidden');

			




	
	
	
		
 
	   }

			




	
	
	
		
 
   })

			




	
	
	
		
 

			




	
	
	
		
 
});

			




	
	
	
		
 
</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.