Changeset - 651e37ed51c6
Parent rev.
Child rev.
[Not reviewed]
default
0 4 0
domruf - 9 years ago 2016-11-03 20:03:03
dominikruf@gmail.com
controllers: consistently use c.cs_pagination for changeset paginators

More consistency makes it easier and less confusion to introduce a shared
changelog_table implementation. Just rename context variables.
4 files changed with 14 insertions and 14 deletions:
kallithea/controllers/changelog.py
7
7
kallithea/templates/changelog/changelog.html
3
3
kallithea/templates/changelog/changelog_summary_data.html
3
3
kallithea/templates/summary/summary.html
1
1
0 comments (0 inline, 0 general)
kallithea/controllers/changelog.py
➞
Show inline comments
 
@@ -38,38 +38,38 @@ from kallithea.lib.auth import LoginRequ
 
from kallithea.lib.base import BaseRepoController, render
 
from kallithea.lib.graphmod import graph_data
 
from kallithea.lib.page import RepoPage
 
from kallithea.lib.vcs.exceptions import RepositoryError, ChangesetDoesNotExistError, \
 
    ChangesetError, NodeDoesNotExistError, EmptyRepositoryError
 
from kallithea.lib.utils2 import safe_int, safe_str
 

			




	
	
	
		
 

			




	
	
	
		
 
log = logging.getLogger(__name__)

			




	
	
	
		
 

			




	
	
	
		
 

			




	
	
	
		
 
def _load_changelog_summary():

			




	
	
	
		
 
    # also used from summary ...

			




	
	
	
		
 
    # only used from summary ...

			




	
	
	
		
 
    p = safe_int(request.GET.get('page'), 1)

			




	
	
	
		
 
    size = safe_int(request.GET.get('size'), 10)

			




	
	
	
		
 

			




	
	
	
		
 
    def url_generator(**kw):

			




	
	
	
		
 
        return url('changelog_summary_home',

			




	
	
	
		
 
                   repo_name=c.db_repo.repo_name, size=size, **kw)

			




	
	
	
		
 

			




	
	
	
		
 
    collection = c.db_repo_scm_instance

			




	
	
	
		
 

			




	
	
	
		
 
    c.repo_changesets = RepoPage(collection, page=p,

			




	
	
	
		
 
    c.cs_pagination = RepoPage(collection, page=p,

			




	
	
	
		
 
                                 items_per_page=size,

			




	
	
	
		
 
                                 url=url_generator)

			




	
	
	
		
 
    page_revisions = [x.raw_id for x in list(c.repo_changesets)]

			




	
	
	
		
 
    page_revisions = [x.raw_id for x in list(c.cs_pagination)]

			




	
	
	
		
 
    c.cs_comments = c.db_repo.get_comments(page_revisions)

			




	
	
	
		
 
    c.cs_statuses = c.db_repo.statuses(page_revisions)

			




	
	
	
		
 

			




	
	
	
		
 

			




	
	
	
		
 
class ChangelogController(BaseRepoController):

			




	
	
	
		
 

			




	
	
	
		
 
    def _before(self, *args, **kwargs):

			




	
	
	
		
 
        super(ChangelogController, self)._before(*args, **kwargs)

			




	
	
	
		
 
        c.affected_files_cut_off = 60

			




	
	
	
		
 

			




	
	
	
		
 
    @staticmethod

			




	
	
	
		
 
    def __get_cs(rev, repo):

			




	
	
		
 
@@ -137,52 +137,52 @@ class ChangelogController(BaseRepoContro

			




	
	
	
		
 
                    try:

			




	
	
	
		
 
                        cs = self.__get_cs(revision, repo_name)

			




	
	
	
		
 
                        collection = cs.get_file_history(f_path)

			




	
	
	
		
 
                    except RepositoryError as e:

			




	
	
	
		
 
                        h.flash(safe_str(e), category='warning')

			




	
	
	
		
 
                        raise HTTPFound(location=h.url('changelog_home', repo_name=repo_name))

			




	
	
	
		
 
                collection = list(reversed(collection))

			




	
	
	
		
 
            else:

			




	
	
	
		
 
                collection = c.db_repo_scm_instance.get_changesets(start=0, end=revision,

			




	
	
	
		
 
                                                        branch_name=branch_name)

			




	
	
	
		
 
            c.total_cs = len(collection)

			




	
	
	
		
 

			




	
	
	
		
 
            c.pagination = RepoPage(collection, page=p, item_count=c.total_cs,

			




	
	
	
		
 
            c.cs_pagination = RepoPage(collection, page=p, item_count=c.total_cs,

			




	
	
	
		
 
                                    items_per_page=c.size, branch=branch_name,)

			




	
	
	
		
 

			




	
	
	
		
 
            page_revisions = [x.raw_id for x in c.pagination]

			




	
	
	
		
 
            page_revisions = [x.raw_id for x in c.cs_pagination]

			




	
	
	
		
 
            c.cs_comments = c.db_repo.get_comments(page_revisions)

			




	
	
	
		
 
            c.cs_statuses = c.db_repo.statuses(page_revisions)

			




	
	
	
		
 
        except EmptyRepositoryError as e:

			




	
	
	
		
 
            h.flash(safe_str(e), category='warning')

			




	
	
	
		
 
            raise HTTPFound(location=url('summary_home', repo_name=c.repo_name))

			




	
	
	
		
 
        except (RepositoryError, ChangesetDoesNotExistError, Exception) as e:

			




	
	
	
		
 
            log.error(traceback.format_exc())

			




	
	
	
		
 
            h.flash(safe_str(e), category='error')

			




	
	
	
		
 
            raise HTTPFound(location=url('changelog_home', repo_name=c.repo_name))

			




	
	
	
		
 

			




	
	
	
		
 
        c.branch_name = branch_name

			




	
	
	
		
 
        c.branch_filters = [('', _('None'))] + \

			




	
	
	
		
 
            [(k, k) for k in c.db_repo_scm_instance.branches.keys()]

			




	
	
	
		
 
        if c.db_repo_scm_instance.closed_branches:

			




	
	
	
		
 
            prefix = _('(closed)') + ' '

			




	
	
	
		
 
            c.branch_filters += [('-', '-')] + \

			




	
	
	
		
 
                [(k, prefix + k) for k in c.db_repo_scm_instance.closed_branches.keys()]

			




	
	
	
		
 
        revs = []

			




	
	
	
		
 
        if not f_path:

			




	
	
	
		
 
            revs = [x.revision for x in c.pagination]

			




	
	
	
		
 
            revs = [x.revision for x in c.cs_pagination]

			




	
	
	
		
 
        c.jsdata = graph_data(c.db_repo_scm_instance, revs)

			




	
	
	
		
 

			




	
	
	
		
 
        c.revision = revision # requested revision ref

			




	
	
	
		
 
        c.first_revision = c.pagination[0] # pagination is never empty here!

			




	
	
	
		
 
        c.first_revision = c.cs_pagination[0] # pagination is never empty here!

			




	
	
	
		
 
        return render('changelog/changelog.html')

			




	
	
	
		
 

			




	
	
	
		
 
    @LoginRequired()

			




	
	
	
		
 
    @HasRepoPermissionLevelDecorator('read')

			




	
	
	
		
 
    def changelog_details(self, cs):

			




	
	
	
		
 
        if request.environ.get('HTTP_X_PARTIAL_XHR'):

			




	
	
	
		
 
            c.cs = c.db_repo_scm_instance.get_changeset(cs)

			




	
	
	
		
 
            return render('changelog/changelog_details.html')

			




	
	
	
		
 
        raise HTTPNotFound()

			




	
	
	
		
 

			




	
	
	
		
 
    @LoginRequired()

			




	
	
	
		
 
    @HasRepoPermissionLevelDecorator('read')

			




        

    


    
    

    

        

                

                    kallithea/templates/changelog/changelog.html
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -23,25 +23,25 @@

			




	
	
	
		
 

			




	
	
	
		
 
<%block name="header_menu">

			




	
	
	
		
 
    ${self.menu('repositories')}

			




	
	
	
		
 
</%block>

			




	
	
	
		
 

			




	
	
	
		
 
<%def name="main()">

			




	
	
	
		
 
${self.repo_context_bar('changelog', c.first_revision.raw_id if c.first_revision else None)}

			




	
	
	
		
 
<div class="panel panel-primary">

			




	
	
	
		
 
    <div class="panel-heading clearfix">

			




	
	
	
		
 
        ${self.breadcrumbs()}

			




	
	
	
		
 
    </div>

			




	
	
	
		
 
    <div class="panel-body changelog-panel">

			




	
	
	
		
 
        %if c.pagination:

			




	
	
	
		
 
        %if c.cs_pagination:

			




	
	
	
		
 
                <div class="changelog-heading clearfix" style="${'display:none' if c.changelog_for_path else ''}">

			




	
	
	
		
 
                    <div class="pull-left">

			




	
	
	
		
 
                        ${h.form(h.url.current(),method='get',class_="form-inline")}

			




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

			




	
	
	
		
 
                            ${h.text('size',size=3,value=c.size,class_='form-control')}

			




	
	
	
		
 
                            ${_('revisions')}

			




	
	
	
		
 
                            %if c.branch_name:

			




	
	
	
		
 
                                ${h.hidden('branch', c.branch_name)}

			




	
	
	
		
 
                            %endif

			




	
	
	
		
 
                            <a href="#" class="btn btn-default btn-sm" id="rev_range_clear" style="display:none">${_('Clear selection')}</a>

			




	
	
	
		
 
                        ${h.end_form()}

			




	
	
	
		
 
                    </div>

			




	
	
		
 
@@ -62,25 +62,25 @@ ${self.repo_context_bar('changelog', c.f

			




	
	
	
		
 
                        <a id="open_new_pr" class="btn btn-default btn-sm"></a>

			




	
	
	
		
 
                        ${_("Branch filter:")} ${h.select('branch_filter',c.branch_name,c.branch_filters)}

			




	
	
	
		
 
                    </div>

			




	
	
	
		
 
                </div>

			




	
	
	
		
 

			




	
	
	
		
 
                <div id="graph_nodes">

			




	
	
	
		
 
                    <canvas id="graph_canvas" style="width:0"></canvas>

			




	
	
	
		
 
                </div>

			




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

			




	
	
	
		
 

			




	
	
	
		
 
                <table class="table" id="changesets">

			




	
	
	
		
 
                <tbody>

			




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

			




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

			




	
	
	
		
 
                    <tr id="chg_${cnt+1}" class="${'mergerow' if len(cs.parents) > 1 else ''}">

			




	
	
	
		
 
                        <td class="checkbox-column">

			




	
	
	
		
 
                            %if c.changelog_for_path:

			




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

			




	
	
	
		
 
                            %else:

			




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

			




	
	
	
		
 
                            %endif

			




	
	
	
		
 
                        </td>

			




	
	
	
		
 
                        <td class="status">

			




	
	
	
		
 
                          %if c.cs_statuses.get(cs.raw_id):

			




	
	
	
		
 
                            %if c.cs_statuses.get(cs.raw_id)[2]:

			




	
	
	
		
 
                              <a data-toggle="tooltip" title="${_('Changeset status: %s by %s\nClick to open associated pull request %s') % (c.cs_statuses.get(cs.raw_id)[1], c.cs_statuses.get(cs.raw_id)[5].username, c.cs_statuses.get(cs.raw_id)[4])}" href="${h.url('pullrequest_show',repo_name=c.cs_statuses.get(cs.raw_id)[3],pull_request_id=c.cs_statuses.get(cs.raw_id)[2])}">

			




	
	
		
 
@@ -172,25 +172,25 @@ ${self.repo_context_bar('changelog', c.f

			




	
	
	
		
 
                                </div>

			




	
	
	
		
 
                            </div>

			




	
	
	
		
 
                        </td>

			




	
	
	
		
 
                    </tr>

			




	
	
	
		
 
                %endfor

			




	
	
	
		
 
                </tbody>

			




	
	
	
		
 
                </table>

			




	
	
	
		
 

			




	
	
	
		
 
                <input type="checkbox" id="singlerange" style="display:none"/>

			




	
	
	
		
 

			




	
	
	
		
 
                </div>

			




	
	
	
		
 

			




	
	
	
		
 
                ${c.pagination.pager()}

			




	
	
	
		
 
                ${c.cs_pagination.pager()}

			




	
	
	
		
 

			




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

			




	
	
	
		
 
        <script type="text/javascript">

			




	
	
	
		
 
            var jsdata = ${h.js(c.jsdata)};

			




	
	
	
		
 
            var graph = new BranchRenderer('graph_canvas', 'graph_content', 'chg_');

			




	
	
	
		
 

			




	
	
	
		
 
            $(document).ready(function(){

			




	
	
	
		
 
                var $checkboxes = $('.changeset_range');

			




	
	
	
		
 

			




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

			




	
	
	
		
 

			




	
	
	
		
 
                var checkbox_checker = function(e) {

			




        

    


    
    

    

        

                

                    kallithea/templates/changelog/changelog_summary_data.html
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
	
		
 
## -*- coding: utf-8 -*-

			




	
	
	
		
 
%if c.repo_changesets:

			




	
	
	
		
 
%if c.cs_pagination:

			




	
	
	
		
 
<table class="table">

			




	
	
	
		
 
    <tr>

			




	
	
	
		
 
        <th class="left"></th>

			




	
	
	
		
 
        <th class="left"></th>

			




	
	
	
		
 
        <th class="left">${_('Revision')}</th>

			




	
	
	
		
 
        <th class="left">${_('Commit Message')}</th>

			




	
	
	
		
 
        <th class="left">${_('Age')}</th>

			




	
	
	
		
 
        <th class="left">${_('Author')}</th>

			




	
	
	
		
 
        <th class="left">${_('Refs')}</th>

			




	
	
	
		
 
    </tr>

			




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

			




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

			




	
	
	
		
 
    <tr class="parity${cnt%2} ${'mergerow' if len(cs.parents) > 1 else ''}">

			




	
	
	
		
 
        <td class="compact">

			




	
	
	
		
 
              %if c.cs_statuses.get(cs.raw_id):

			




	
	
	
		
 
                %if c.cs_statuses.get(cs.raw_id)[2]:

			




	
	
	
		
 
                  <a data-toggle="tooltip" title="${_('Changeset status: %s by %s\nClick to open associated pull request %s') % (c.cs_statuses.get(cs.raw_id)[1], c.cs_statuses.get(cs.raw_id)[5].username, c.cs_statuses.get(cs.raw_id)[4])}" href="${h.url('pullrequest_show',repo_name=c.cs_statuses.get(cs.raw_id)[3],pull_request_id=c.cs_statuses.get(cs.raw_id)[2])}">

			




	
	
	
		
 
                    <i class="icon-circle changeset-status-${c.cs_statuses.get(cs.raw_id)[0]}"></i>

			




	
	
	
		
 
                  </a>

			




	
	
	
		
 
                %else:

			




	
	
	
		
 
                  <a data-toggle="tooltip" title="${_('Changeset status: %s by %s') % (c.cs_statuses.get(cs.raw_id)[1], c.cs_statuses.get(cs.raw_id)[5].username)}"

			




	
	
	
		
 
                     href="${c.cs_comments[cs.raw_id][0].url()}">

			




	
	
	
		
 
                    <i class="icon-circle changeset-status-${c.cs_statuses.get(cs.raw_id)[0]}"></i>

			




	
	
	
		
 
                  </a>

			




	
	
		
 
@@ -62,25 +62,25 @@

			




	
	
	
		
 
            %endfor

			




	
	
	
		
 
            %if cs.branch:

			




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

			




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

			




	
	
	
		
 
             </span>

			




	
	
	
		
 
            %endif

			




	
	
	
		
 
        </td>

			




	
	
	
		
 
    </tr>

			




	
	
	
		
 
%endfor

			




	
	
	
		
 

			




	
	
	
		
 
</table>

			




	
	
	
		
 

			




	
	
	
		
 
${c.repo_changesets.pager()}

			




	
	
	
		
 
${c.cs_pagination.pager()}

			




	
	
	
		
 

			




	
	
	
		
 
%else:

			




	
	
	
		
 

			




	
	
	
		
 
%if h.HasRepoPermissionLevel('write')(c.repo_name):

			




	
	
	
		
 
<h4>${_('Add or upload files directly via Kallithea')}</h4>

			




	
	
	
		
 
<div>

			




	
	
	
		
 
  <div id="add_node_id" class="add_node">

			




	
	
	
		
 
      <a class="btn btn-default btn-xs" href="${h.url('files_add_home',repo_name=c.repo_name,revision=0,f_path='', anchor='edit')}">${_('Add New File')}</a>

			




	
	
	
		
 
  </div>

			




	
	
	
		
 
</div>

			




	
	
	
		
 
%endif

			




	
	
	
		
 

			




        

    


    
    

    

        

                

                    kallithea/templates/summary/summary.html
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -161,25 +161,25 @@ ${self.repo_context_bar('summary')}

			




	
	
	
		
 
                <i class="icon-graph"></i> ${_('Statistics')}

			




	
	
	
		
 
              </a>

			




	
	
	
		
 
            </li>

			




	
	
	
		
 
            %endif

			




	
	
	
		
 
        </ul>

			




	
	
	
		
 
    </div>

			




	
	
	
		
 
</div>

			




	
	
	
		
 

			




	
	
	
		
 

			




	
	
	
		
 
<div class="panel panel-primary">

			




	
	
	
		
 
    <div class="panel-heading">

			




	
	
	
		
 
        <div class="breadcrumbs panel-title">

			




	
	
	
		
 
        %if c.repo_changesets:

			




	
	
	
		
 
        %if c.cs_pagination:

			




	
	
	
		
 
            ${h.link_to(_('Latest Changes'),h.url('changelog_home',repo_name=c.repo_name))}

			




	
	
	
		
 
        %else:

			




	
	
	
		
 
            ${_('Quick Start')}

			




	
	
	
		
 
         %endif

			




	
	
	
		
 
        </div>

			




	
	
	
		
 
    </div>

			




	
	
	
		
 
    <div class="panel-body">

			




	
	
	
		
 
        <div id="shortlog_data">

			




	
	
	
		
 
            <%include file='../changelog/changelog_summary_data.html'/>

			




	
	
	
		
 
        </div>

			




	
	
	
		
 
    </div>

			




	
	
	
		
 
</div>

			




        

    



    


    



    



      

      





    
    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.