Changeset - f0ec7be78077
Parent rev.
Child rev.
[Not reviewed]
default
0 6 0
Mads Kiilerich - 8 years ago 2017-08-28 05:25:40
mads@kiilerich.com
controllers: consistently use c.cs_comments and cs_statuses

c.comments and c.statuses were also used for lists of comments and statuses. To
get more consistency and avoid confusion and conflicts, use different for names
for mappings from changeset hashes.
6 files changed with 29 insertions and 30 deletions:
kallithea/controllers/changelog.py
4
4
kallithea/controllers/compare.py
1
1
kallithea/controllers/pullrequests.py
2
3
kallithea/templates/changelog/changelog.html
10
10
kallithea/templates/changelog/changelog_summary_data.html
10
10
kallithea/templates/compare/compare_cs.html
2
2
0 comments (0 inline, 0 general)
kallithea/controllers/changelog.py
➞
Show inline comments
 
@@ -58,14 +58,14 @@ def _load_changelog_summary():
 
    collection = c.db_repo_scm_instance
 

			




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

			




	
	
	
		
 
                                 items_per_page=size,

			




	
	
	
		
 
                                 url=url_generator)

			




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

			




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

			




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

			




	
	
	
		
 
    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)

			




	
	
		
 
@@ -147,14 +147,14 @@ class ChangelogController(BaseRepoContro

			




	
	
	
		
 
            c.total_cs = len(collection)

			




	
	
	
		
 

			




	
	
	
		
 
            c.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]

			




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

			




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

			




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

			




        

    


    
    

    

        

                

                    kallithea/controllers/compare.py
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -220,13 +220,13 @@ class CompareController(BaseRepoControll

			




	
	
	
		
 

			




	
	
	
		
 
        c.cs_ranges, c.cs_ranges_org, c.ancestors = self._get_changesets(

			




	
	
	
		
 
            c.a_repo.scm_instance.alias, c.a_repo.scm_instance, c.a_rev,

			




	
	
	
		
 
            c.cs_repo.scm_instance, c.cs_rev)

			




	
	
	
		
 
        raw_ids = [x.raw_id for x in c.cs_ranges]

			




	
	
	
		
 
        c.cs_comments = c.cs_repo.get_comments(raw_ids)

			




	
	
	
		
 
        c.statuses = c.cs_repo.statuses(raw_ids)

			




	
	
	
		
 
        c.cs_statuses = c.cs_repo.statuses(raw_ids)

			




	
	
	
		
 

			




	
	
	
		
 
        revs = [ctx.revision for ctx in reversed(c.cs_ranges)]

			




	
	
	
		
 
        c.jsdata = graph_data(c.cs_repo.scm_instance, revs)

			




	
	
	
		
 

			




	
	
	
		
 
        if partial:

			




	
	
	
		
 
            return render('compare/compare_cs.html')

			




        

    


    
    

    

        

                

                    kallithea/controllers/pullrequests.py
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -575,13 +575,13 @@ class PullrequestsController(BaseRepoCon

			




	
	
	
		
 
        c.avail_revs = avail_revs

			




	
	
	
		
 
        c.avail_cs = [org_scm_instance.get_changeset(r) for r in avail_show]

			




	
	
	
		
 
        c.avail_jsdata = graph_data(org_scm_instance, avail_show)

			




	
	
	
		
 

			




	
	
	
		
 
        raw_ids = [x.raw_id for x in c.cs_ranges]

			




	
	
	
		
 
        c.cs_comments = c.cs_repo.get_comments(raw_ids)

			




	
	
	
		
 
        c.statuses = c.cs_repo.statuses(raw_ids)

			




	
	
	
		
 
        c.cs_statuses = c.cs_repo.statuses(raw_ids)

			




	
	
	
		
 

			




	
	
	
		
 
        ignore_whitespace = request.GET.get('ignorews') == '1'

			




	
	
	
		
 
        line_context = safe_int(request.GET.get('context'), 3)

			




	
	
	
		
 
        c.ignorews_url = _ignorews_url

			




	
	
	
		
 
        c.context_url = _context_url

			




	
	
	
		
 
        c.fulldiff = request.GET.get('fulldiff')

			




	
	
		
 
@@ -625,14 +625,13 @@ class PullrequestsController(BaseRepoCon

			




	
	
	
		
 
                                pull_request=pull_request_id)

			




	
	
	
		
 
        # count inline comments

			




	
	
	
		
 
        for __, lines in c.inline_comments:

			




	
	
	
		
 
            for comments in lines.values():

			




	
	
	
		
 
                c.inline_cnt += len(comments)

			




	
	
	
		
 
        # comments

			




	
	
	
		
 
        c.comments = cc_model.get_comments(c.db_repo.repo_id,

			




	
	
	
		
 
                                           pull_request=pull_request_id)

			




	
	
	
		
 
        c.comments = cc_model.get_comments(c.db_repo.repo_id, pull_request=pull_request_id)

			




	
	
	
		
 

			




	
	
	
		
 
        # (badly named) pull-request status calculation based on reviewer votes

			




	
	
	
		
 
        (c.pull_request_reviewers,

			




	
	
	
		
 
         c.pull_request_pending_reviewers,

			




	
	
	
		
 
         c.current_voting_result,

			




	
	
	
		
 
         ) = cs_model.calculate_pull_request_result(c.pull_request)

			




        

    


    
    

    

        

                

                    kallithea/templates/changelog/changelog.html
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -78,21 +78,21 @@ ${self.repo_context_bar('changelog', c.f

			




	
	
	
		
 
                                ${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.statuses.get(cs.raw_id):

			




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

			




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

			




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

			




	
	
	
		
 
                          %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.statuses.get(cs.raw_id)[1], c.statuses.get(cs.raw_id)[5].username)}"

			




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

			




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

			




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

			




	
	
	
		
 
                            %endif

			




	
	
	
		
 
                          %endif

			




	
	
	
		
 
                        </td>

			




	
	
	
		
 
                        <td class="author" data-toggle="tooltip" title="${cs.author}">

			




	
	
	
		
 
                            ${h.gravatar(h.email_or_none(cs.author), size=16)}

			




	
	
		
 
@@ -118,15 +118,15 @@ ${self.repo_context_bar('changelog', c.f

			




	
	
	
		
 
                                    <div class="message-firstline">${h.urlify_text(message_lines[0], c.repo_name,h.url('changeset_home',repo_name=c.repo_name,revision=cs.raw_id))}</div>

			




	
	
	
		
 
                                    %if len(message_lines) > 1:

			




	
	
	
		
 
                                    <div class="message-full hidden">${h.urlify_text(cs.message, c.repo_name)}</div>

			




	
	
	
		
 
                                    %endif

			




	
	
	
		
 
                                </div>

			




	
	
	
		
 
                                <div class="extra-container">

			




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

			




	
	
	
		
 
                                        <a class="comments-container comments-cnt" href="${c.comments[cs.raw_id][0].url()}" data-toggle="tooltip" title="${_('%s comments') % len(c.comments[cs.raw_id])}">

			




	
	
	
		
 
                                            ${len(c.comments[cs.raw_id])}

			




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

			




	
	
	
		
 
                                        <a class="comments-container comments-cnt" href="${c.cs_comments[cs.raw_id][0].url()}" data-toggle="tooltip" title="${_('%s comments') % len(c.cs_comments[cs.raw_id])}">

			




	
	
	
		
 
                                            ${len(c.cs_comments[cs.raw_id])}

			




	
	
	
		
 
                                            <i class="icon-comment-discussion"></i>

			




	
	
	
		
 
                                        </a>

			




	
	
	
		
 
                                    %endif

			




	
	
	
		
 
                                    %if cs.bumped:

			




	
	
	
		
 
                                        <span class="bumpedtag" title="Bumped">

			




	
	
	
		
 
                                            Bumped

			




        

    


    
    

    

        

                

                    kallithea/templates/changelog/changelog_summary_data.html
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -10,31 +10,31 @@

			




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

			




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

			




	
	
	
		
 
    </tr>

			




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

			




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

			




	
	
	
		
 
        <td class="compact">

			




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

			




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

			




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

			




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

			




	
	
	
		
 
              %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.statuses.get(cs.raw_id)[1], c.statuses.get(cs.raw_id)[5].username)}"

			




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

			




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

			




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

			




	
	
	
		
 
                %endif

			




	
	
	
		
 
              %endif

			




	
	
	
		
 
        </td>

			




	
	
	
		
 
        <td class="compact">

			




	
	
	
		
 
              %if c.comments.get(cs.raw_id,[]):

			




	
	
	
		
 
              %if c.cs_comments.get(cs.raw_id,[]):

			




	
	
	
		
 
               <div class="comments-container">

			




	
	
	
		
 
                   <div title="${('comments')}">

			




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

			




	
	
	
		
 
                          <i class="icon-comment"></i>${len(c.comments[cs.raw_id])}

			




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

			




	
	
	
		
 
                          <i class="icon-comment"></i>${len(c.cs_comments[cs.raw_id])}

			




	
	
	
		
 
                       </a>

			




	
	
	
		
 
                   </div>

			




	
	
	
		
 
               </div>

			




	
	
	
		
 
              %endif

			




	
	
	
		
 
        </td>

			




	
	
	
		
 
        <td>

			




        

    


    
    

    

        

                

                    kallithea/templates/compare/compare_cs.html
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -30,14 +30,14 @@

			




	
	
	
		
 
    <div id="graph_content_pr">

			




	
	
	
		
 

			




	
	
	
		
 
    <table class="table compare_view_commits">

			




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

			




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

			




	
	
	
		
 
        <td>

			




	
	
	
		
 
          %if cs.raw_id in c.statuses:

			




	
	
	
		
 
              <i class="icon-circle changeset-status-${c.statuses[cs.raw_id][0]}" title="${_('Changeset status: %s') % c.statuses[cs.raw_id][1]}"></i>

			




	
	
	
		
 
          %if cs.raw_id in c.cs_statuses:

			




	
	
	
		
 
              <i class="icon-circle changeset-status-${c.cs_statuses[cs.raw_id][0]}" title="${_('Changeset status: %s') % c.cs_statuses[cs.raw_id][1]}"></i>

			




	
	
	
		
 
          %endif

			




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

			




	
	
	
		
 
              <div class="comments-container">

			




	
	
	
		
 
                  <div class="comments-cnt" title="${_('Changeset has comments')}">

			




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

			




	
	
	
		
 
                          ${len(c.cs_comments[cs.raw_id])}

			




        

    



    


    



    



      

      





    
    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.