kallithea Changeset - 91492a72b2dc

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 23 insertions and 6 deletions:

rhodecode/controllers/pullrequests.py

rhodecode/public/css/style.css

rhodecode/templates/changeset/changeset_file_comment.html

0 comments (0 inline, 0 general)

rhodecode/controllers/pullrequests.py

➞

Show inline comments

@@ @@ -430,16 +430,21 @@ class PullrequestsController(BaseRepoCon @@
+            )
         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'):
             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)
             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))

rhodecode/public/css/style.css

➞

Show inline comments

@@ @@ -3616,12 +3616,16 @@ div.gravatar img { @@
   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;

rhodecode/templates/changeset/changeset_file_comment.html

➞

Show inline comments

@@ @@ -124,24 +124,24 @@ @@
                 | <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>
@@ @@ -155,10 +155,18 @@ YUE.onDOMReady(function () { @@
            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)