Changeset - 27f498ee6db0
Parent rev.
Child rev.
[Not reviewed]
default
0 1 0
Mads Kiilerich - 12 years ago 2013-07-02 00:37:01
madski@unity3d.com
pull requests: PR from changelog should not use tip but explicit revision or tip branch name
1 file changed with 8 insertions and 7 deletions:
kallithea/templates/changelog/changelog.html
8
7
0 comments (0 inline, 0 general)
kallithea/templates/changelog/changelog.html
➞
Show inline comments
 
@@ -34,49 +34,50 @@ ${self.repo_context_bar('changelog', c.f
 
    <!-- box / title -->
 
    <div class="title">
 
        ${self.breadcrumbs()}
 
    </div>
 
    <div class="table">
 
        % if c.pagination:
 
            <div id="graph">
 
                <div style="overflow:auto; display:${'none' if c.changelog_for_path else ''}">
 
                    <div class="container_header">
 
                       <div style="float:right; margin: 0px 0px 0px 4px">${h.select('branch_filter',c.branch_name,c.branch_filters)}</div>
 
                       <div class="info_box" style="text-align: right; float: right">
 
                            <a href="#" class="btn btn-mini" id="rev_range_container" style="display:none"></a>
 
                            <a href="#" class="btn btn-mini" id="rev_range_clear" style="display:none">${_('Clear selection')}</a>
 
                            %if c.revision:
 
                                <a class="btn btn-mini" href="${h.url('changelog_home', repo_name=c.repo_name)}">
 
                                    ${_('Go to tip of repository')}
 
                                </a>
 
                            %endif
 
                            %if c.db_repo.fork:
 
                                <a id="compare_fork"
 
                                   title="${_('Compare fork with %s' % c.db_repo.fork.repo_name)}"
 
                                   href="${h.url('compare_url',repo_name=c.db_repo.fork.repo_name,org_ref_type=c.db_repo.landing_rev[0],org_ref=c.db_repo.landing_rev[1],other_repo=c.repo_name,other_ref_type='branch' if request.GET.get('branch') else c.db_repo.landing_rev[0],other_ref=request.GET.get('branch') or c.db_repo.landing_rev[1], merge=1)}"
 
                                   class="btn btn-mini"><i class="icon-loop"></i> ${_('Compare fork with parent repo (%s)' % c.db_repo.fork.repo_name)}</a>
 
                            %endif
 
                            <a id="open_new_pr" href="${h.url('pullrequest_home',repo_name=c.repo_name)}" class="btn btn-mini">${_('Open new pull request')}</a>
 
                            ## text and href of open_new_pr is controlled from javascript
 
                            <a id="open_new_pr" class="btn btn-mini"></a>
 
                       </div>
 

			




	
	
	
		
 
                       ${h.form(h.url.current(),method='get')}

			




	
	
	
		
 
                       <div style="float:left">

			




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

			




	
	
	
		
 
                           ${h.text('size',size=1,value=c.size)}

			




	
	
	
		
 
                           ${_('revisions')}

			




	
	
	
		
 
                       </div>

			




	
	
	
		
 
                       ${h.end_form()}

			




	
	
	
		
 
                    </div>

			




	
	
	
		
 
                </div>

			




	
	
	
		
 
                <div id="graph_nodes">

			




	
	
	
		
 
                    <canvas id="graph_canvas"></canvas>

			




	
	
	
		
 
                </div>

			




	
	
	
		
 
                <div id="graph_content" style="${'margin: 0px' if c.changelog_for_path else ''}">

			




	
	
	
		
 

			




	
	
	
		
 
                <table id="changesets">

			




	
	
	
		
 
                <tbody>

			




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

			




	
	
	
		
 
                    <tr id="chg_${cnt+1}" class="container ${'tablerow%s' % (cnt%2)}">

			




	
	
	
		
 
                        <td class="checkbox">

			




	
	
	
		
 
                            %if c.changelog_for_path:

			




	
	
	
		
 
                                ${h.checkbox(cs.raw_id,class_="changeset_range", disabled="disabled")}

			




	
	
	
		
 
                            %else:

			




	
	
		
 
@@ -140,107 +141,107 @@ ${self.repo_context_bar('changelog', c.f

			




	
	
	
		
 
                                    %endfor

			




	
	
	
		
 
                                    %if (not c.branch_name) and cs.branch:

			




	
	
	
		
 
                                        <div class="branchtag" title="${_('Branch %s' % cs.branch)}">

			




	
	
	
		
 
                                            ${h.link_to(cs.branch,h.url('changelog_home',repo_name=c.repo_name,branch=cs.branch))}

			




	
	
	
		
 
                                        </div>

			




	
	
	
		
 
                                    %endif

			




	
	
	
		
 
                                </div>

			




	
	
	
		
 
                            </div>

			




	
	
	
		
 
                        </td>

			




	
	
	
		
 
                    </tr>

			




	
	
	
		
 
                %endfor

			




	
	
	
		
 
                </tbody>

			




	
	
	
		
 
                </table>

			




	
	
	
		
 

			




	
	
	
		
 
                <div class="pagination-wh pagination-left">

			




	
	
	
		
 
                    ${c.pagination.pager('$link_previous ~2~ $link_next')}

			




	
	
	
		
 
                </div>

			




	
	
	
		
 
            </div>

			




	
	
	
		
 
        </div>

			




	
	
	
		
 

			




	
	
	
		
 
        <script type="text/javascript" src="${h.url('/js/graph.js')}"></script>

			




	
	
	
		
 
        <script type="text/javascript">

			




	
	
	
		
 
            YAHOO.util.Event.onDOMReady(function(){

			




	
	
	
		
 

			




	
	
	
		
 
                //Monitor range checkboxes and build a link to changesets

			




	
	
	
		
 
                //ranges

			




	
	
	
		
 
                //Monitor range checkboxes and build a link to changesets ranges

			




	
	
	
		
 
                var checkboxes = YUD.getElementsByClassName('changeset_range');

			




	
	
	
		
 
                // register our routes needed for this view

			




	
	
	
		
 
                // register extra routes needed for this view

			




	
	
	
		
 
                pyroutes.register('changeset_home', "${h.url('changeset_home', repo_name='%(repo_name)s', revision='%(revision)s')}", ['repo_name', 'revision']);

			




	
	
	
		
 

			




	
	
	
		
 
                var checkbox_checker = function(e){

			




	
	
	
		
 
                    var checked_checkboxes = [];

			




	
	
	
		
 
                    for (pos in checkboxes){

			




	
	
	
		
 
                        if(checkboxes[pos].checked){

			




	
	
	
		
 
                            checked_checkboxes.push(checkboxes[pos]);

			




	
	
	
		
 
                        }

			




	
	
	
		
 
                    }

			




	
	
	
		
 
                    if(YUD.get('open_new_pr')){

			




	
	
	
		
 
                        if(checked_checkboxes.length>1){

			




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

			




	
	
	
		
 
                        } else {

			




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

			




	
	
	
		
 
                            if(checked_checkboxes.length>0){

			




	
	
	
		
 
                                YUD.get('open_new_pr').innerHTML = _TM['Open new pull request for selected changesets'];

			




	
	
	
		
 
                            }else{

			




	
	
	
		
 
                                YUD.get('open_new_pr').innerHTML = _TM['Open new pull request'];

			




	
	
	
		
 
                            }

			




	
	
	
		
 
                        }

			




	
	
	
		
 
                    }

			




	
	
	
		
 

			




	
	
	
		
 
                    if(checked_checkboxes.length>0){

			




	
	
	
		
 
                        var rev_end = checked_checkboxes[0].name;

			




	
	
	
		
 
                        var rev_start = checked_checkboxes[checked_checkboxes.length-1].name;

			




	
	
	
		
 
                        var url = pyroutes.url('changeset_home', {'repo_name': '${c.repo_name}',

			




	
	
	
		
 
                                                                  'revision': rev_start+'...'+rev_end});

			




	
	
	
		
 

			




	
	
	
		
 
                        var link = (rev_start == rev_end)

			




	
	
	
		
 
                            ? _TM['Show selected changeset __S']

			




	
	
	
		
 
                            : _TM['Show selected changesets __S &rarr; __E'];

			




	
	
	
		
 

			




	
	
	
		
 
                        link = link.replace('__S',rev_start.substr(0,6));

			




	
	
	
		
 
                        link = link.replace('__E',rev_end.substr(0,6));

			




	
	
	
		
 
                        YUD.get('rev_range_container').href = url;

			




	
	
	
		
 
                        YUD.get('rev_range_container').innerHTML = link;

			




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

			




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

			




	
	
	
		
 

			




	
	
	
		
 
                        YUD.get('open_new_pr').href = pyroutes.url('pullrequest_home',

			




	
	
	
		
 
                                                                   {'repo_name': '${c.repo_name}',

			




	
	
	
		
 
                                                                    'rev_start': rev_start,

			




	
	
	
		
 
                                                                    'rev_end': rev_end})

			




	
	
	
		
 

			




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

			




	
	
	
		
 
                    }else{

			




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

			




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

			




	
	
	
		
 
                        %if c.branch_name:

			




	
	
	
		
 
                        %if c.revision:

			




	
	
	
		
 
                            YUD.get('open_new_pr').href = pyroutes.url('pullrequest_home',

			




	
	
	
		
 
                                                                       {'repo_name': '${c.repo_name}',

			




	
	
	
		
 
                                                                        'branch':'${c.branch_name}'});

			




	
	
	
		
 
                                                                        'rev_end':'${c.first_revision.raw_id}'});

			




	
	
	
		
 
                        %else:

			




	
	
	
		
 
                            YUD.get('open_new_pr').href = pyroutes.url('pullrequest_home',

			




	
	
	
		
 
                                                                       {'repo_name': '${c.repo_name}'});

			




	
	
	
		
 
                                                                       {'repo_name': '${c.repo_name}',

			




	
	
	
		
 
                                                                        'branch':'${c.first_revision.branch}'});

			




	
	
	
		
 
                        %endif

			




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

			




	
	
	
		
 
                    }

			




	
	
	
		
 
                };

			




	
	
	
		
 
                YUE.onDOMReady(checkbox_checker);

			




	
	
	
		
 
                YUE.on(checkboxes,'click', checkbox_checker);

			




	
	
	
		
 

			




	
	
	
		
 
                YUE.on('rev_range_clear','click',function(e){

			




	
	
	
		
 
                    for (var i=0; i<checkboxes.length; i++){

			




	
	
	
		
 
                        var cb = checkboxes[i];

			




	
	
	
		
 
                        cb.checked = false;

			




	
	
	
		
 
                    }

			




	
	
	
		
 
                    checkbox_checker();

			




	
	
	
		
 
                    YUE.preventDefault(e);

			




	
	
	
		
 
                });

			




	
	
	
		
 

			




	
	
	
		
 
                var msgs = YUQ('.message');

			




	
	
	
		
 
                // get first element height

			




	
	
	
		
 
                var el = YUQ('#graph_content .container')[0];

			




	
	
	
		
 
                var row_h = el.clientHeight;

			




	
	
	
		
 
                for(var i=0;i<msgs.length;i++){

			




	
	
	
		
 
                    var m = msgs[i];

			




	
	
	
		
 

			




	
	
	
		
 
                    var h = m.clientHeight;

			




        

    



    


    



    



      

      





    
    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.