Changeset - 2145dfdc3af3
Parent rev.
Child rev.
[Not reviewed]
default
0 5 0
Mads Kiilerich - 11 years ago 2015-01-21 17:35:11
madski@unity3d.com
pullrequests: make top pane one big form with one save button

This will temporarily break the PR update functionality.
5 files changed with 37 insertions and 76 deletions:
kallithea/config/routing.py
5
kallithea/controllers/pullrequests.py
16
30
kallithea/model/forms.py
1
1
kallithea/public/js/base.js
1
19
kallithea/templates/pullrequests/pullrequest_show.html
19
21
0 comments (0 inline, 0 general)
kallithea/config/routing.py
➞
Show inline comments
 
@@ -710,17 +710,12 @@ def make_map(config):
 
                                                method=["GET"]))
 
    rmap.connect('pullrequest_post',
 
                 '/{repo_name:.*?}/pull-request/{pull_request_id}',
 
                 controller='pullrequests',
 
                 action='post', conditions=dict(function=check_repo,
 
                                                method=["POST"]))
 
    rmap.connect('pullrequest_update',
 
                 '/{repo_name:.*?}/pull-request/{pull_request_id}',
 
                 controller='pullrequests',
 
                 action='update', conditions=dict(function=check_repo,
 
                                                method=["PUT"]))
 
    rmap.connect('pullrequest_delete',
 
                 '/{repo_name:.*?}/pull-request/{pull_request_id}',
 
                 controller='pullrequests',
 
                 action='delete', conditions=dict(function=check_repo,
 
                                                method=["DELETE"]))
 

			




        

    


    
    

    

        

                

                    kallithea/controllers/pullrequests.py
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -483,49 +483,35 @@ class PullrequestsController(BaseRepoCon

			




	
	
	
		
 
    # pullrequest_post for PR editing

			




	
	
	
		
 
    @LoginRequired()

			




	
	
	
		
 
    @NotAnonymous()

			




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

			




	
	
	
		
 
                                   'repository.admin')

			




	
	
	
		
 
    def post(self, repo_name, pull_request_id):

			




	
	
	
		
 
        repo = RepoModel()._get_repo(repo_name)

			




	
	
	
		
 
        pull_request = PullRequest.get_or_404(pull_request_id)

			




	
	
	
		
 
        old_description = pull_request.description

			




	
	
	
		
 

			




	
	
	
		
 
        _form = PullRequestPostForm()().to_python(request.POST)

			




	
	
	
		
 

			




	
	
	
		
 
        pull_request.title = _form['pullrequest_title']

			




	
	
	
		
 
        pull_request.description = _form['pullrequest_desc'].strip() or _('No description')

			




	
	
	
		
 

			




	
	
	
		
 
        PullRequestModel().mention_from_description(pull_request, old_description)

			




	
	
	
		
 

			




	
	
	
		
 
        Session().commit()

			




	
	
	
		
 
        h.flash(_('Pull request updated'), category='success')

			




	
	
	
		
 

			




	
	
	
		
 
        return redirect(pull_request.url())

			




	
	
	
		
 

			




	
	
	
		
 
    # pullrequest_update for updating reviewer list

			




	
	
	
		
 
    @LoginRequired()

			




	
	
	
		
 
    @NotAnonymous()

			




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

			




	
	
	
		
 
                                   'repository.admin')

			




	
	
	
		
 
    @jsonify

			




	
	
	
		
 
    def update(self, repo_name, pull_request_id):

			




	
	
	
		
 
        pull_request = PullRequest.get_or_404(pull_request_id)

			




	
	
	
		
 
        if pull_request.is_closed():

			




	
	
	
		
 
            raise HTTPForbidden()

			




	
	
	
		
 
        #only owner or admin can update it

			




	
	
	
		
 
        owner = pull_request.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:

			




	
	
	
		
 
            reviewers_ids = map(int, filter(lambda v: v not in [None, ''],

			




	
	
	
		
 
                request.POST.get('reviewers_ids', '').split(',')))

			




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

			




	
	
	
		
 
            raise HTTPForbidden()

			




	
	
	
		
 

			




	
	
	
		
 
        _form = PullRequestPostForm()().to_python(request.POST)

			




	
	
	
		
 

			




	
	
	
		
 
            PullRequestModel().update_reviewers(pull_request_id, reviewers_ids)

			




	
	
	
		
 
            Session().commit()

			




	
	
	
		
 
            return True

			




	
	
	
		
 
        raise HTTPForbidden()

			




	
	
	
		
 
        old_description = pull_request.description

			




	
	
	
		
 
        pull_request.title = _form['pullrequest_title']

			




	
	
	
		
 
        pull_request.description = _form['pullrequest_desc'].strip() or _('No description')

			




	
	
	
		
 
        PullRequestModel().mention_from_description(pull_request, old_description)

			




	
	
	
		
 

			




	
	
	
		
 
        reviewers_ids = [int(s) for s in _form['review_members']]

			




	
	
	
		
 
        PullRequestModel().update_reviewers(pull_request_id, reviewers_ids)

			




	
	
	
		
 

			




	
	
	
		
 
        Session().commit()

			




	
	
	
		
 
        h.flash(_('Pull request updated'), category='success')

			




	
	
	
		
 

			




	
	
	
		
 
        return redirect(pull_request.url())

			




	
	
	
		
 

			




	
	
	
		
 
    @LoginRequired()

			




	
	
	
		
 
    @NotAnonymous()

			




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

			




	
	
	
		
 
                                   'repository.admin')

			




	
	
	
		
 
    @jsonify

			




        

    


    
    

    

        

                

                    kallithea/model/forms.py
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -482,13 +482,12 @@ def UserExtraIpForm():

			




	
	
	
		
 

			




	
	
	
		
 
def PullRequestForm(repo_id):

			




	
	
	
		
 
    class _PullRequestForm(formencode.Schema):

			




	
	
	
		
 
        allow_extra_fields = True

			




	
	
	
		
 
        filter_extra_fields = True

			




	
	
	
		
 

			




	
	
	
		
 
        user = v.UnicodeString(strip=True, required=True)

			




	
	
	
		
 
        org_repo = v.UnicodeString(strip=True, required=True)

			




	
	
	
		
 
        org_ref = v.UnicodeString(strip=True, required=True)

			




	
	
	
		
 
        other_repo = v.UnicodeString(strip=True, required=True)

			




	
	
	
		
 
        other_ref = v.UnicodeString(strip=True, required=True)

			




	
	
	
		
 
        review_members = v.Set()

			




	
	
	
		
 

			




	
	
		
 
@@ -502,12 +501,13 @@ def PullRequestPostForm():

			




	
	
	
		
 
    class _PullRequestPostForm(formencode.Schema):

			




	
	
	
		
 
        allow_extra_fields = True

			




	
	
	
		
 
        filter_extra_fields = True

			




	
	
	
		
 

			




	
	
	
		
 
        pullrequest_title = v.UnicodeString(strip=True, required=True)

			




	
	
	
		
 
        pullrequest_desc = v.UnicodeString(strip=True, required=False)

			




	
	
	
		
 
        review_members = v.Set()

			




	
	
	
		
 

			




	
	
	
		
 
    return _PullRequestPostForm

			




	
	
	
		
 

			




	
	
	
		
 

			




	
	
	
		
 
def GistForm(lifetime_options):

			




	
	
	
		
 
    class _GistForm(formencode.Schema):

			




        

    


    
    

    

        

                

                    kallithea/public/js/base.js
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -1486,34 +1486,16 @@ var addReviewMember = function(id,fname,

			




	
	
	
		
 
    }

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
var removeReviewMember = function(reviewer_id, repo_name, pull_request_id){

			




	
	
	
		
 
    var $li = $('#reviewer_{0}'.format(reviewer_id));

			




	
	
	
		
 
    $li.find('div div').css("text-decoration", "line-through");

			




	
	
	
		
 
    $li.find('input').remove();

			




	
	
	
		
 
    $li.find('input').attr('name', 'review_members_removed');

			




	
	
	
		
 
    $li.find('.reviewer_member_remove').replaceWith(' (remove not saved)');

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
/* handle "Save Changes" of addReviewMember and removeReviewMember on PR */

			




	
	
	
		
 
var updateReviewers = function(reviewers_ids, repo_name, pull_request_id){

			




	
	
	
		
 
    if (reviewers_ids === undefined){

			




	
	
	
		
 
        var reviewers_ids = [];

			




	
	
	
		
 
        $('#review_members').find('input').each(function(){

			




	
	
	
		
 
                reviewers_ids.push(this.value);

			




	
	
	
		
 
            });

			




	
	
	
		
 
    }

			




	
	
	
		
 
    var url = pyroutes.url('pullrequest_update', {"repo_name":repo_name,

			




	
	
	
		
 
                                                  "pull_request_id": pull_request_id});

			




	
	
	
		
 
    var postData = {'_method':'put',

			




	
	
	
		
 
                    'reviewers_ids': reviewers_ids};

			




	
	
	
		
 
    var success = function(o){

			




	
	
	
		
 
        window.location.reload();

			




	
	
	
		
 
    }

			




	
	
	
		
 
    ajaxPOST(url,postData,success);

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
/* activate auto completion of users and groups ... but only used for users as PR reviewers */

			




	
	
	
		
 
var PullRequestAutoComplete = function (divid, cont, users_list, groups_list) {

			




	
	
	
		
 
    var myUsers = users_list;

			




	
	
	
		
 
    var myGroups = groups_list;

			




	
	
	
		
 

			




	
	
	
		
 
    // Define a custom search function for the DataSource of users

			




        

    


    
    

    

        

                

                    kallithea/templates/pullrequests/pullrequest_show.html
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -21,12 +21,13 @@ ${self.repo_context_bar('showpullrequest

			




	
	
	
		
 
<div class="box">

			




	
	
	
		
 
  <!-- box / title -->

			




	
	
	
		
 
  <div class="title">

			




	
	
	
		
 
    ${self.breadcrumbs()}

			




	
	
	
		
 
  </div>

			




	
	
	
		
 

			




	
	
	
		
 
  ${h.form(url('pullrequest_post', repo_name=c.repo_name, pull_request_id=c.pull_request.pull_request_id), method='post', id='pull_request_form')}

			




	
	
	
		
 
    <div class="form pr-box" style="float: left">

			




	
	
	
		
 
      <div class="pr-details-title ${'closed' if c.pull_request.is_closed() else ''}">

			




	
	
	
		
 
          ${_('Title')}: ${c.pull_request.title}

			




	
	
	
		
 
          %if c.pull_request.is_closed():

			




	
	
	
		
 
              (${_('Closed')})

			




	
	
	
		
 
          %endif

			




	
	
		
 
@@ -46,14 +47,12 @@ ${self.repo_context_bar('showpullrequest

			




	
	
	
		
 
            <div style="white-space:pre-wrap; line-height: 14px">${h.urlify_commit(c.pull_request.description, c.pull_request.org_repo.repo_name)}</div>

			




	
	
	
		
 
          </div>

			




	
	
	
		
 
        </div>

			




	
	
	
		
 

			




	
	
	
		
 
        %if editable:

			




	
	
	
		
 
        <div id="pr-edit-form" style="display:none">

			




	
	
	
		
 
          ${h.form(url('pullrequest_post', repo_name=c.repo_name, pull_request_id=c.pull_request.pull_request_id), method='post', id='pull_request_form')}

			




	
	
	
		
 

			




	
	
	
		
 
          <div class="field">

			




	
	
	
		
 
              <div class="label-summary">

			




	
	
	
		
 
                  <label for="pullrequest_title">${_('Title')}:</label>

			




	
	
	
		
 
              </div>

			




	
	
	
		
 
              <div class="input">

			




	
	
	
		
 
                  ${h.text('pullrequest_title',class_="large",value=c.pull_request.title,placeholder=_('Summarize the changes'))}

			




	
	
		
 
@@ -64,19 +63,13 @@ ${self.repo_context_bar('showpullrequest

			




	
	
	
		
 
              <div class="label-summary label-textarea">

			




	
	
	
		
 
                  <label for="pullrequest_desc">${_('Description')}:</label>

			




	
	
	
		
 
              </div>

			




	
	
	
		
 
              <div class="textarea text-area editor">

			




	
	
	
		
 
                  ${h.textarea('pullrequest_desc',size=30,content=c.pull_request.description,placeholder=_('Write a short description on this pull request'))}

			




	
	
	
		
 
              </div>

			




	
	
	
		
 
              <div class="buttons">

			




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

			




	
	
	
		
 
                  ${h.reset('reset',_('Cancel'),class_="btn btn-mini",onclick="YUD.setStyle('pr-edit-form','display','none');YUD.setStyle(YUD.getElementsByClassName('pr-not-edit'),'display','')")}

			




	
	
	
		
 
             </div>

			




	
	
	
		
 
          </div>

			




	
	
	
		
 

			




	
	
	
		
 
          ${h.end_form()}

			




	
	
	
		
 
        </div>

			




	
	
	
		
 
        %endif

			




	
	
	
		
 

			




	
	
	
		
 
        <div class="field">

			




	
	
	
		
 
          <div class="label-summary">

			




	
	
	
		
 
              <label>${_('Reviewer voting result')}:</label>

			




	
	
		
 
@@ -170,14 +163,13 @@ ${self.repo_context_bar('showpullrequest

			




	
	
	
		
 
                  <span>${c.pull_request.author.username_and_name}</span><br/>

			




	
	
	
		
 
                  <span><a href="mailto:${c.pull_request.author.email}">${c.pull_request.author.email}</a></span><br/>

			




	
	
	
		
 
              </div>

			




	
	
	
		
 
          </div>

			




	
	
	
		
 
        </div>

			




	
	
	
		
 

			




	
	
	
		
 
        ${h.form(url('pullrequest_copy_update',repo_name=c.repo_name,pull_request_id=c.pull_request.pull_request_id), method='post')}

			




	
	
	
		
 
          <div class="field">

			




	
	
	
		
 
        <div class="field">

			




	
	
	
		
 
            <div class="label-summary">

			




	
	
	
		
 
              <label>${_('Update')}:</label>

			




	
	
	
		
 
            </div>

			




	
	
	
		
 
            <div class="input">

			




	
	
	
		
 
              <div class="msg-div">${c.update_msg}</div>

			




	
	
	
		
 
              %if c.available:

			




	
	
		
 
@@ -197,15 +189,13 @@ ${self.repo_context_bar('showpullrequest

			




	
	
	
		
 
            </div>

			




	
	
	
		
 
            %if editable and c.available:

			




	
	
	
		
 
              <div class="buttons">

			




	
	
	
		
 
                ${h.submit('copy_update',_('Create Pull Request Update'),class_="btn btn-small")}

			




	
	
	
		
 
              </div>

			




	
	
	
		
 
            %endif

			




	
	
	
		
 
          </div>

			




	
	
	
		
 
        ${h.end_form()}

			




	
	
	
		
 

			




	
	
	
		
 
        </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 5px 10px">

			




	
	
		
 
@@ -234,21 +224,27 @@ ${self.repo_context_bar('showpullrequest

			




	
	
	
		
 
          %if editable:

			




	
	
	
		
 
          <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 style="padding:0px 10px">

			




	
	
	
		
 
             <span id="update_pull_request" class="btn btn-small">${_('Save Changes')}</span>

			




	
	
	
		
 
            </div>

			




	
	
	
		
 
          </div>

			




	
	
	
		
 
          %endif

			




	
	
	
		
 
        </div>

			




	
	
	
		
 
    </div>

			




	
	
	
		
 

			




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

			




	
	
	
		
 
    <div class="form" style="clear:both">

			




	
	
	
		
 
      <div class="fields">

			




	
	
	
		
 
        %if editable:

			




	
	
	
		
 
          <div class="buttons">

			




	
	
	
		
 
            ${h.submit('pr-form-save',_('Save'),class_="btn btn-small")}

			




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

			




	
	
	
		
 
          </div>

			




	
	
	
		
 
        %endif

			




	
	
	
		
 
      </div>

			




	
	
	
		
 
    </div>

			




	
	
	
		
 
  ${h.end_form()}

			




	
	
	
		
 
</div>

			




	
	
	
		
 

			




	
	
	
		
 
<div class="box">

			




	
	
	
		
 
    <div class="title">

			




	
	
	
		
 
      <div class="breadcrumbs">${_('Pull Request Content')}</div>

			




	
	
	
		
 
    </div>

			




	
	
		
 
@@ -303,13 +299,12 @@ ${self.repo_context_bar('showpullrequest

			




	
	
	
		
 
    // TODO: switch this to pyroutes

			




	
	
	
		
 
    AJAX_COMMENT_URL = "${url('pullrequest_comment',repo_name=c.repo_name,pull_request_id=c.pull_request.pull_request_id)}";

			




	
	
	
		
 
    AJAX_COMMENT_DELETE_URL = "${url('pullrequest_comment_delete',repo_name=c.repo_name,comment_id='__COMMENT_ID__')}";

			




	
	
	
		
 

			




	
	
	
		
 
    pyroutes.register('pullrequest_comment', "${url('pullrequest_comment',repo_name='%(repo_name)s',pull_request_id='%(pull_request_id)s')}", ['repo_name', 'pull_request_id']);

			




	
	
	
		
 
    pyroutes.register('pullrequest_comment_delete', "${url('pullrequest_comment_delete',repo_name='%(repo_name)s',comment_id='%(comment_id)s')}", ['repo_name', 'comment_id']);

			




	
	
	
		
 
    pyroutes.register('pullrequest_update', "${url('pullrequest_update',repo_name='%(repo_name)s',pull_request_id='%(pull_request_id)s')}", ['repo_name', 'pull_request_id']);

			




	
	
	
		
 

			




	
	
	
		
 
    </script>

			




	
	
	
		
 

			




	
	
	
		
 
    ## diff block

			




	
	
	
		
 
    <%namespace name="diff_block" file="/changeset/diff_block.html"/>

			




	
	
	
		
 
    ${diff_block.diff_block_js()}

			




	
	
		
 
@@ -346,14 +341,17 @@ ${self.repo_context_bar('showpullrequest

			




	
	
	
		
 
          // inject comments into they proper positions

			




	
	
	
		
 
          var file_comments = $('.inline-comment-placeholder').toArray();

			




	
	
	
		
 
          renderInlineComments(file_comments);

			




	
	
	
		
 

			




	
	
	
		
 
          linkInlineComments(document.getElementsByClassName('firstlink'), document.getElementsByClassName("inline-comment"));

			




	
	
	
		
 

			




	
	
	
		
 
          $('#update_pull_request').click(function(e){

			




	
	
	
		
 
              updateReviewers(undefined, "${c.repo_name}", "${c.pull_request.pull_request_id}");

			




	
	
	
		
 
          var $org_review_members = $('#review_members').clone();

			




	
	
	
		
 
          $('#pr-form-reset').click(function(e){

			




	
	
	
		
 
              $('#pr-edit-form').hide();

			




	
	
	
		
 
              $('.pr-not-edit').show();

			




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

			




	
	
	
		
 
          });

			




	
	
	
		
 

			




	
	
	
		
 
          // hack: re-navigate to target after JS is done ... if a target is set and setting href thus won't reload

			




	
	
	
		
 
          if (window.location.hash != "") {

			




	
	
	
		
 
              window.location.href = window.location.href;

			




	
	
	
		
 
          }

			




        

    



    


    



    



      

      





    
    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.