Changeset - c5f49ffbd72b
Parent rev.
Child rev.
[Not reviewed]
default
0 2 0
Mads Kiilerich - 12 years ago 2013-12-10 19:30:37
madski@unity3d.com
pullrequests: don't add repo owner as reviewer in all PRs
2 files changed with 0 insertions and 24 deletions:
kallithea/controllers/pullrequests.py
6
kallithea/templates/pullrequests/pullrequest.html
18
0 comments (0 inline, 0 general)
kallithea/controllers/pullrequests.py
➞
Show inline comments
 
@@ -274,54 +274,48 @@ class PullrequestsController(BaseRepoCon
 

			




	
	
	
		
 
        else:

			




	
	
	
		
 
            c.a_repo = org_repo

			




	
	
	
		
 
            c.a_refs, c.default_a_ref = self._get_repo_refs(org_scm_instance) # without rev and branch

			




	
	
	
		
 

			




	
	
	
		
 
        # gather forks and add to this list ... even though it is rare to

			




	
	
	
		
 
        # request forks to pull from their parent

			




	
	
	
		
 
        for fork in org_repo.forks:

			




	
	
	
		
 
            c.a_repos.append((fork.repo_name, fork.repo_name))

			




	
	
	
		
 

			




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

			




	
	
	
		
 

			




	
	
	
		
 
    @LoginRequired()

			




	
	
	
		
 
    @NotAnonymous()

			




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

			




	
	
	
		
 
                                   'repository.admin')

			




	
	
	
		
 
    @jsonify

			




	
	
	
		
 
    def repo_info(self, repo_name):

			




	
	
	
		
 
        repo = RepoModel()._get_repo(repo_name)

			




	
	
	
		
 
        refs, selected_ref = self._get_repo_refs(repo.scm_instance)

			




	
	
	
		
 
        return {

			




	
	
	
		
 
            'description': repo.description.split('\n', 1)[0],

			




	
	
	
		
 
            'selected_ref': selected_ref,

			




	
	
	
		
 
            'refs': refs,

			




	
	
	
		
 
            'user': dict(user_id=repo.user.user_id,

			




	
	
	
		
 
                         username=repo.user.username,

			




	
	
	
		
 
                         firstname=repo.user.firstname,

			




	
	
	
		
 
                         lastname=repo.user.lastname,

			




	
	
	
		
 
                         gravatar_link=h.gravatar_url(repo.user.email, 28),

			




	
	
	
		
 
                         gravatar_size=14),

			




	
	
	
		
 
            }

			




	
	
	
		
 

			




	
	
	
		
 
    @LoginRequired()

			




	
	
	
		
 
    @NotAnonymous()

			




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

			




	
	
	
		
 
                                   'repository.admin')

			




	
	
	
		
 
    def create(self, repo_name):

			




	
	
	
		
 
        repo = RepoModel()._get_repo(repo_name)

			




	
	
	
		
 
        try:

			




	
	
	
		
 
            _form = PullRequestForm(repo.repo_id)().to_python(request.POST)

			




	
	
	
		
 
        except formencode.Invalid, errors:

			




	
	
	
		
 
            log.error(traceback.format_exc())

			




	
	
	
		
 
            log.error(str(errors))

			




	
	
	
		
 
            msg = _('Error creating pull request: %s') % errors.msg

			




	
	
	
		
 
            h.flash(msg, 'error')

			




	
	
	
		
 
            raise HTTPBadRequest

			




	
	
	
		
 

			




	
	
	
		
 
        # heads up: org and other might seem backward here ...

			




	
	
	
		
 
        org_repo_name = _form['org_repo']

			




	
	
	
		
 
        org_ref = _form['org_ref'] # will have merge_rev as rev but symbolic name

			




	
	
	
		
 
        org_repo = RepoModel()._get_repo(org_repo_name)

			




	
	
	
		
 
        (org_ref_type,

			




	
	
	
		
 
         org_ref_name,

			




	
	
	
		
 
         org_rev) = org_ref.split(':')

			




        

    


    
    

    

        

                

                    kallithea/templates/pullrequests/pullrequest.html
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -78,60 +78,48 @@ ${self.repo_context_bar('showpullrequest

			




	
	
	
		
 
                            <b>${_('Revision')}:</b> <span id="other_rev_span">-</span>

			




	
	
	
		
 
                            </div>

			




	
	
	
		
 
                        </div>

			




	
	
	
		
 
                    </div>

			




	
	
	
		
 
                    <div style="clear:both"></div>

			




	
	
	
		
 
                </div>

			




	
	
	
		
 
            </div>

			




	
	
	
		
 

			




	
	
	
		
 
            <div class="field">

			




	
	
	
		
 
                <div class="buttons">

			




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

			




	
	
	
		
 
                    ${h.reset('reset',_('Reset'),class_="btn")}

			




	
	
	
		
 
               </div>

			




	
	
	
		
 
            </div>

			




	
	
	
		
 

			




	
	
	
		
 
        </div>

			




	
	
	
		
 

			




	
	
	
		
 
        ## Reviewers

			




	
	
	
		
 
        <div style="float:left; border-left:1px dashed #eee">

			




	
	
	
		
 
            <div class="pr-details-title">${_('Pull Request Reviewers')}</div>

			




	
	
	
		
 
            <div id="reviewers" style="padding:0px 0px 0px 15px">

			




	
	
	
		
 
              ## members goes here !

			




	
	
	
		
 
              <div>

			




	
	
	
		
 
                <ul id="review_members" class="group_members">

			




	
	
	
		
 
                %for member in [c.a_repo.user]:

			




	
	
	
		
 
                  <li id="reviewer_${member.user_id}">

			




	
	
	
		
 
                    <div class="reviewers_member">

			




	
	
	
		
 
                      <div class="gravatar">${h.gravatar(member.email, 14)}</div>

			




	
	
	
		
 
                      <div style="float:left">${member.firstname} ${member.lastname} (${_('owner')})</div>

			




	
	
	
		
 
                      <input type="hidden" value="${member.user_id}" name="review_members" />

			




	
	
	
		
 
                      <span class="action_button" style="padding: 3px" onclick="removeReviewMember(${member.user_id})" title="${_('Remove reviewer')}">

			




	
	
	
		
 
                          <i class="icon-minus-circled"></i>

			




	
	
	
		
 
                      </span>

			




	
	
	
		
 
                    </div>

			




	
	
	
		
 
                  </li>

			




	
	
	
		
 
                %endfor

			




	
	
	
		
 
                </ul>

			




	
	
	
		
 
              </div>

			




	
	
	
		
 

			




	
	
	
		
 
              <div class='ac'>

			




	
	
	
		
 
                <div class="reviewer_ac">

			




	
	
	
		
 
                   ${h.text('user', class_='yui-ac-input',placeholder=_('Type name of reviewer to add'))}

			




	
	
	
		
 
                   <div id="reviewers_container"></div>

			




	
	
	
		
 
                </div>

			




	
	
	
		
 
              </div>

			




	
	
	
		
 
            </div>

			




	
	
	
		
 
        </div>

			




	
	
	
		
 

			




	
	
	
		
 
        <div style="clear:both;padding: 0 0 30px 0;"></div>

			




	
	
	
		
 

			




	
	
	
		
 
        <h4>${_('Changesets')}</h4>

			




	
	
	
		
 
        <div style="float:left;padding:0px 30px 30px 30px">

			




	
	
	
		
 
           ## overview pulled by ajax

			




	
	
	
		
 
           <div style="float:left" id="pull_request_overview"></div>

			




	
	
	
		
 
        </div>

			




	
	
	
		
 
        <div style="clear:both;"></div>

			




	
	
	
		
 

			




	
	
	
		
 
    </div>

			




	
	
	
		
 

			




	
	
	
		
 
    ${h.end_form()}

			




	
	
		
 
@@ -154,54 +142,48 @@ ${self.repo_context_bar('showpullrequest

			




	
	
	
		
 
      if (pendingajax) {

			




	
	
	
		
 
          pendingajax.abort();

			




	
	
	
		
 
          pendingajax = undefined;

			




	
	
	
		
 
      }

			




	
	
	
		
 
      pendingajax = ajaxGET(pyroutes.url('pullrequest_repo_info', {"repo_name": repo_name}),

			




	
	
	
		
 
          function(data){

			




	
	
	
		
 
              pendingajax = undefined;

			




	
	
	
		
 
              $('#other_repo_desc').html(data.description);

			




	
	
	
		
 

			




	
	
	
		
 
              // replace options of other_ref with the ones for the current other_repo

			




	
	
	
		
 
              $other_ref.empty();

			




	
	
	
		
 
              for(var i = 0; i < data.refs.length; i++)

			




	
	
	
		
 
              {

			




	
	
	
		
 
                var $optgroup = $('<optgroup/>').attr('label', data.refs[i][1]);

			




	
	
	
		
 
                var options = data.refs[i][0];

			




	
	
	
		
 
                var length = options.length;

			




	
	
	
		
 
                for(var j = 0; j < length; j++)

			




	
	
	
		
 
                {

			




	
	
	
		
 
                  $optgroup.append($('<option/>').text(options[j][1]).val(options[j][0]));

			




	
	
	
		
 
                }

			




	
	
	
		
 
                $other_ref.append($optgroup);

			




	
	
	
		
 
              }

			




	
	
	
		
 
              $other_ref.val(data.selected_ref);

			




	
	
	
		
 

			




	
	
	
		
 
              // reset && add the reviewer based on selected repo

			




	
	
	
		
 
              $('#review_members').html('');

			




	
	
	
		
 
              addReviewMember(data.user.user_id, data.user.firstname,

			




	
	
	
		
 
                              data.user.lastname, data.user.username,

			




	
	
	
		
 
                              data.user.gravatar_link, data.user_gravatar_size);

			




	
	
	
		
 

			




	
	
	
		
 
              // re-populate the select2 thingie

			




	
	
	
		
 
              $("#other_ref").select2({

			




	
	
	
		
 
                  dropdownAutoWidth: true

			




	
	
	
		
 
              });

			




	
	
	
		
 

			




	
	
	
		
 
              $other_ref.prop('disabled', false);

			




	
	
	
		
 
              loadPreview();

			




	
	
	
		
 
          });

			




	
	
	
		
 
  };

			




	
	
	
		
 

			




	
	
	
		
 
  var loadPreview = function(){

			




	
	
	
		
 
      //url template

			




	
	
	
		
 
      var url = "${h.url('compare_url',

			




	
	
	
		
 
                         repo_name='__other_repo__',

			




	
	
	
		
 
                         org_ref_type='rev',

			




	
	
	
		
 
                         org_ref_name='__other_ref_name__',

			




	
	
	
		
 
                         other_repo='__org_repo__',

			




	
	
	
		
 
                         other_ref_type='rev',

			




	
	
	
		
 
                         other_ref_name='__org_ref_name__',

			




	
	
	
		
 
                         as_form=True,

			




	
	
	
		
 
                         merge=True,

			




	
	
	
		
 
                         )}";

			




	
	
	
		
 
      var org_repo = $('#pull_request_form #org_repo').val();

			




	
	
	
		
 
      var org_ref = $('#pull_request_form #org_ref').val().split(':');

			




        

    



    


    



    



      

      





    
    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.