Changeset - fee908b9bd2d
Parent rev.
Child rev.
[Not reviewed]
default
0 1 0
Mads Kiilerich - 11 years ago 2015-01-21 17:35:11
madski@unity3d.com
pullrequests: introduce 'editable' flag to avoid repeated permission checks
1 file changed with 7 insertions and 8 deletions:
kallithea/templates/pullrequests/pullrequest_show.html
7
8
0 comments (0 inline, 0 general)
kallithea/templates/pullrequests/pullrequest_show.html
➞
Show inline comments
 
<%inherit file="/base/base.html"/>
 

			




	
	
	
		
 
<%def name="title()">

			




	
	
	
		
 
    ${_('%s Pull Request #%s') % (c.repo_name, c.pull_request.pull_request_id)}

			




	
	
	
		
 
    %if c.site_name:

			




	
	
	
		
 
        &middot; ${c.site_name}

			




	
	
	
		
 
    %endif

			




	
	
	
		
 
</%def>

			




	
	
	
		
 

			




	
	
	
		
 
<%def name="breadcrumbs_links()">

			




	
	
	
		
 
    ${_('Pull request #%s from %s#%s') % (c.pull_request.pull_request_id, c.pull_request.org_repo.repo_name, c.cs_branch_name)}

			




	
	
	
		
 
</%def>

			




	
	
	
		
 

			




	
	
	
		
 
<%def name="page_nav()">

			




	
	
	
		
 
    ${self.menu('repositories')}

			




	
	
	
		
 
</%def>

			




	
	
	
		
 

			




	
	
	
		
 
<%def name="main()">

			




	
	
	
		
 
<% editable = not c.pull_request.is_closed() and (h.HasPermissionAny('hg.admin')() or h.HasRepoPermissionAny('repository.admin')(c.repo_name) or c.pull_request.author.user_id == c.authuser.user_id) %>

			




	
	
	
		
 
${self.repo_context_bar('showpullrequest')}

			




	
	
	
		
 
<div class="box">

			




	
	
	
		
 
    <!-- box / title -->

			




	
	
	
		
 
    <div class="title">

			




	
	
	
		
 
        ${self.breadcrumbs()}

			




	
	
	
		
 
    </div>

			




	
	
	
		
 

			




	
	
	
		
 
    <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

			




	
	
	
		
 
      </div>

			




	
	
	
		
 
      <div id="pr-summary" class="fields">

			




	
	
	
		
 

			




	
	
	
		
 
        <div class="field pr-not-edit" style="min-height:37px">

			




	
	
	
		
 
          <div class="label-summary">

			




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

			




	
	
	
		
 
            %if not c.pull_request.is_closed() and (h.HasPermissionAny('hg.admin', 'repository.admin')() or c.pull_request.author.user_id == c.authuser.user_id):

			




	
	
	
		
 
            %if editable:

			




	
	
	
		
 
            <div style="margin: 5px">

			




	
	
	
		
 
              <a class="btn btn-small" onclick="YUD.setStyle('pr-edit-form','display','');YUD.setStyle(YUD.getElementsByClassName('pr-not-edit'),'display','none')">${_("Edit")}</a>

			




	
	
	
		
 
            </div>

			




	
	
	
		
 
            %endif

			




	
	
	
		
 
          </div>

			




	
	
	
		
 
          <div class="input">

			




	
	
	
		
 
            <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 not c.pull_request.is_closed() and (h.HasPermissionAny('hg.admin', 'repository.admin')() or c.pull_request.author.user_id == c.authuser.user_id):

			




	
	
	
		
 
        %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'))}

			




	
	
	
		
 
              </div>

			




	
	
	
		
 
          </div>

			




	
	
	
		
 

			




	
	
	
		
 
          <div class="field">

			




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

			




	
	
		
 
@@ -173,95 +174,93 @@ ${self.repo_context_bar('showpullrequest

			




	
	
	
		
 
        </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="label-summary">

			




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

			




	
	
	
		
 
            </div>

			




	
	
	
		
 
            <div class="input">

			




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

			




	
	
	
		
 
              %if c.available:

			




	
	
	
		
 
              <div style="max-height:200px; overflow-y:auto; overflow-x:hidden; margin-bottom: 10px">

			




	
	
	
		
 
                <table class="noborder">

			




	
	
	
		
 
                  %for cnt, cs in enumerate(reversed(c.available)):

			




	
	
	
		
 
                    <tr>

			




	
	
	
		
 
                    <td>${h.radio(name='updaterev', value=cs.raw_id)}</td>

			




	
	
	
		
 
                    <td>${h.link_to(h.show_id(cs),h.url('changeset_home',repo_name=c.cs_repo.repo_name,revision=cs.raw_id))}</td>

			




	
	
	
		
 
                    <td><div class="message" style="white-space:normal; height:1.1em; max-width: 500px; padding:0">${h.urlify_commit(cs.message, c.repo_name)}</div></td>

			




	
	
	
		
 
                    </tr>

			




	
	
	
		
 
                  %endfor

			




	
	
	
		
 
                </table>

			




	
	
	
		
 
              </div>

			




	
	
	
		
 
              %endif

			




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

			




	
	
	
		
 
            </div>

			




	
	
	
		
 
            %if c.available and not c.pull_request.is_closed():

			




	
	
	
		
 
            %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>

			




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

			




	
	
	
		
 
          ## members goes here !

			




	
	
	
		
 
          <div>

			




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

			




	
	
	
		
 
            %for member,status in c.pull_request_reviewers:

			




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

			




	
	
	
		
 
                <div class="reviewers_member">

			




	
	
	
		
 
                    <div class="reviewer_status tooltip" title="${h.tooltip(h.changeset_status_lbl(status.status if status else 'not_reviewed'))}">

			




	
	
	
		
 
                      <i class="icon-circle changeset-status-${status.status if status else 'not_reviewed'}"></i>

			




	
	
	
		
 
                    </div>

			




	
	
	
		
 
                  <div class="reviewer_gravatar gravatar"><img alt="gravatar" src="${h.gravatar_url(member.email,14)}"/> </div>

			




	
	
	
		
 
                  <div style="float:left;">${member.full_name} (${_('owner') if c.pull_request.user_id == member.user_id else _('reviewer')})</div>

			




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

			




	
	
	
		
 
                  %if not c.pull_request.is_closed() and (h.HasPermissionAny('hg.admin')() or h.HasRepoPermissionAny('repository.admin')(c.repo_name) or c.pull_request.user_id == c.authuser.user_id):

			




	
	
	
		
 
                  %if editable:

			




	
	
	
		
 
                  <div class="reviewer_member_remove action_button" onclick="removeReviewMember(${member.user_id})" title="${_('Remove reviewer')}">

			




	
	
	
		
 
                      <i class="icon-minus-circled" style="color: #FF4444;"></i>

			




	
	
	
		
 
                  </div>

			




	
	
	
		
 
                  %endif

			




	
	
	
		
 
                </div>

			




	
	
	
		
 
              </li>

			




	
	
	
		
 
            %endfor

			




	
	
	
		
 
            </ul>

			




	
	
	
		
 
          </div>

			




	
	
	
		
 
          %if not c.pull_request.is_closed():

			




	
	
	
		
 
          %if editable:

			




	
	
	
		
 
          <div class='ac'>

			




	
	
	
		
 
            %if h.HasPermissionAny('hg.admin')() or h.HasRepoPermissionAny('repository.admin')(c.repo_name) or c.pull_request.author.user_id == c.authuser.user_id:

			




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

			




	
	
	
		
 
            %endif

			




	
	
	
		
 
          </div>

			




	
	
	
		
 
          %endif

			




	
	
	
		
 
        </div>

			




	
	
	
		
 
       </div>

			




	
	
	
		
 

			




	
	
	
		
 
    <div style="overflow: auto; clear: both">

			




	
	
	
		
 
      ##DIFF

			




	
	
	
		
 
      <div class="table" style="float:left;clear:none">

			




	
	
	
		
 
          <div class="diffblock">

			




	
	
	
		
 
              <div style="padding:5px">

			




	
	
	
		
 
                ${_('Summary of Pull Request Content')}

			




	
	
	
		
 
              </div>

			




	
	
	
		
 
          </div>

			




	
	
	
		
 
          <div id="changeset_compare_view_content">

			




	
	
	
		
 
              <div style="font-size:1.1em;font-weight: bold;clear:both;padding-top:10px">

			




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

			




	
	
	
		
 
              </div>

			




	
	
	
		
 
              ##CS

			




	
	
	
		
 
              <div style="font-size:1.1em;font-weight: bold;clear:both;padding-top:10px">

			




	
	
	
		
 
                ${ungettext('Showing %s commit','Showing %s commits', len(c.cs_ranges)) % len(c.cs_ranges)}

			




	
	
	
		
 
              </div>

			




	
	
	
		
 
              <%include file="/compare/compare_cs.html" />

			




	
	
	
		
 

			




	
	
	
		
 
              <div style="font-size:1.1em;font-weight: bold;clear:both;padding-top:10px">

			




	
	
		
 
@@ -338,30 +337,30 @@ ${self.repo_context_bar('showpullrequest

			




	
	
	
		
 

			




	
	
	
		
 
    <script type="text/javascript">

			




	
	
	
		
 
      $(document).ready(function(){

			




	
	
	
		
 
          PullRequestAutoComplete('user', 'reviewers_container', _USERS_AC_DATA, _GROUPS_AC_DATA);

			




	
	
	
		
 

			




	
	
	
		
 
          $('.add-bubble').click(function(e){

			




	
	
	
		
 
              var tr = e.currentTarget;

			




	
	
	
		
 
              injectInlineForm(tr.parentNode.parentNode);

			




	
	
	
		
 
          });

			




	
	
	
		
 

			




	
	
	
		
 
          // 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}");

			




	
	
	
		
 
          });

			




	
	
	
		
 

			




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

			




	
	
	
		
 
          }

			




	
	
	
		
 
      })

			




	
	
	
		
 
      });

			




	
	
	
		
 
    </script>

			




	
	
	
		
 

			




	
	
	
		
 
</div>

			




	
	
	
		
 

			




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