Changeset - b3299a079fa6
Parent rev.
Child rev.
[Not reviewed]
default
0 5 0
Mads Kiilerich - 10 years ago 2015-05-27 23:15:36
madski@unity3d.com
comments: introduce .url method for linking to originating PR or changeset page
5 files changed with 12 insertions and 5 deletions:
kallithea/model/db.py
7
kallithea/templates/changelog/changelog.html
2
2
kallithea/templates/changelog/changelog_summary_data.html
1
1
kallithea/templates/changeset/changeset_file_comment.html
1
1
kallithea/templates/compare/compare_cs.html
1
1
0 comments (0 inline, 0 general)
kallithea/model/db.py
➞
Show inline comments
 
@@ -2174,24 +2174,31 @@ class ChangesetComment(Base, BaseModel):
 

			




	
	
	
		
 
        :param cls:

			




	
	
	
		
 
        :param revision:

			




	
	
	
		
 
        """

			




	
	
	
		
 
        q = Session().query(User)\

			




	
	
	
		
 
                .join(ChangesetComment.author)

			




	
	
	
		
 
        if revision is not None:

			




	
	
	
		
 
            q = q.filter(cls.revision == revision)

			




	
	
	
		
 
        elif pull_request_id is not None:

			




	
	
	
		
 
            q = q.filter(cls.pull_request_id == pull_request_id)

			




	
	
	
		
 
        return q.all()

			




	
	
	
		
 

			




	
	
	
		
 
    def url(self):

			




	
	
	
		
 
        anchor = "comment-%s" % self.comment_id

			




	
	
	
		
 
        import kallithea.lib.helpers as h

			




	
	
	
		
 
        if self.revision:

			




	
	
	
		
 
            return h.url('changeset_home', repo_name=self.repo.repo_name, revision=self.revision, anchor=anchor)

			




	
	
	
		
 
        elif self.pull_request_id is not None:

			




	
	
	
		
 
            return self.pull_request.url(anchor=anchor)

			




	
	
	
		
 

			




	
	
	
		
 
class ChangesetStatus(Base, BaseModel):

			




	
	
	
		
 
    __tablename__ = 'changeset_statuses'

			




	
	
	
		
 
    __table_args__ = (

			




	
	
	
		
 
        Index('cs_revision_idx', 'revision'),

			




	
	
	
		
 
        Index('cs_version_idx', 'version'),

			




	
	
	
		
 
        Index('cs_pull_request_id_idx', 'pull_request_id'),

			




	
	
	
		
 
        Index('cs_changeset_comment_id_idx', 'changeset_comment_id'),

			




	
	
	
		
 
        Index('cs_pull_request_id_user_id_version_idx', 'pull_request_id', 'user_id', 'version'),

			




	
	
	
		
 
        UniqueConstraint('repo_id', 'revision', 'version'),

			




	
	
	
		
 
        {'extend_existing': True, 'mysql_engine': 'InnoDB',

			




	
	
	
		
 
         'mysql_charset': 'utf8', 'sqlite_autoincrement': True}

			




        

    


    
    

    

        

                

                    kallithea/templates/changelog/changelog.html
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -84,25 +84,25 @@ ${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 class="status">

			




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

			




	
	
	
		
 
                            <div class="changeset-status-ico">

			




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

			




	
	
	
		
 
                              <a class="tooltip" title="${_('Changeset status: %s\nClick to open associated pull request %s') % (c.statuses.get(cs.raw_id)[1], 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>

			




	
	
	
		
 
                              </a>

			




	
	
	
		
 
                            %else:

			




	
	
	
		
 
                              <a class="tooltip" title="${_('Changeset status: %s') % c.statuses.get(cs.raw_id)[1]}" href="${h.url('changeset_home',repo_name=c.repo_name,revision=cs.raw_id,anchor='comment-%s' % c.comments[cs.raw_id][0].comment_id)}">

			




	
	
	
		
 
                              <a class="tooltip" title="${_('Changeset status: %s') % c.statuses.get(cs.raw_id)[1]}" href="${c.comments[cs.raw_id][0].url()}">

			




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

			




	
	
	
		
 
                              </a>

			




	
	
	
		
 
                            %endif

			




	
	
	
		
 
                            </div>

			




	
	
	
		
 
                          %endif

			




	
	
	
		
 
                        </td>

			




	
	
	
		
 
                        <td class="author">

			




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

			




	
	
	
		
 
                            <span title="${cs.author}" class="user">${h.shorter(h.person(cs.author),22)}</span>

			




	
	
	
		
 
                        </td>

			




	
	
	
		
 
                        <td class="hash" style="width:${len(h.show_id(cs))*6.5}px">

			




	
	
	
		
 
                            <a href="${h.url('changeset_home',repo_name=c.repo_name,revision=cs.raw_id)}">

			




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

			




	
	
	
		
 
                            <div class="date">${h.age(cs.date,True)}</div>

			




	
	
	
		
 
                        </td>

			




	
	
	
		
 
                        <td class="expand_commit" commit_id="${cs.raw_id}" title="${_('Expand commit message')}">

			




	
	
	
		
 
                            <i class="icon-align-left" style="color:#999"></i>

			




	
	
	
		
 
                        </td>

			




	
	
	
		
 
                        <td class="mid">

			




	
	
	
		
 
                            <div class="log-container">

			




	
	
	
		
 
                                <div class="message" id="C-${cs.raw_id}">${h.urlify_commit(cs.message, c.repo_name,h.url('changeset_home',repo_name=c.repo_name,revision=cs.raw_id))}</div>

			




	
	
	
		
 
                                <div class="extra-container">

			




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

			




	
	
	
		
 
                                        <div class="comments-container">

			




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

			




	
	
	
		
 
                                                <a href="${h.url('changeset_home',repo_name=c.repo_name,revision=cs.raw_id,anchor='comment-%s' % c.comments[cs.raw_id][0].comment_id)}">

			




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

			




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

			




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

			




	
	
	
		
 
                                                </a>

			




	
	
	
		
 
                                            </div>

			




	
	
	
		
 
                                        </div>

			




	
	
	
		
 
                                    %endif

			




	
	
	
		
 
                                    %if h.is_hg(c.db_repo_scm_instance):

			




	
	
	
		
 
                                        %for book in cs.bookmarks:

			




	
	
	
		
 
                                            <div class="booktag" title="${_('Bookmark %s') % book}">

			




	
	
	
		
 
                                                ${h.link_to(book,h.url('changeset_home',repo_name=c.repo_name,revision=cs.raw_id))}

			




	
	
	
		
 
                                            </div>

			




	
	
	
		
 
                                        %endfor

			




        

    


    
    

    

        

                

                    kallithea/templates/changelog/changelog_summary_data.html
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -22,25 +22,25 @@

			




	
	
	
		
 
                  </a>

			




	
	
	
		
 
                %else:

			




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

			




	
	
	
		
 
                %endif

			




	
	
	
		
 
                </span>

			




	
	
	
		
 
              %endif

			




	
	
	
		
 
            </div>

			




	
	
	
		
 
        </td>

			




	
	
	
		
 
        <td class="compact">

			




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

			




	
	
	
		
 
               <div class="comments-container">

			




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

			




	
	
	
		
 
                       <a href="${h.url('changeset_home',repo_name=c.repo_name,revision=cs.raw_id,anchor='comment-%s' % c.comments[cs.raw_id][0].comment_id)}">

			




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

			




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

			




	
	
	
		
 
                       </a>

			




	
	
	
		
 
                   </div>

			




	
	
	
		
 
               </div>

			




	
	
	
		
 
              %endif

			




	
	
	
		
 
        </td>

			




	
	
	
		
 
        <td>

			




	
	
	
		
 
            <a href="${h.url('changeset_home',repo_name=c.repo_name,revision=cs.raw_id)}" class="revision-link">${h.show_id(cs)}</a>

			




	
	
	
		
 
        </td>

			




	
	
	
		
 
        <td>

			




	
	
	
		
 
            ${h.urlify_commit(h.chop_at(cs.message,'\n'),c.repo_name, h.url('changeset_home',repo_name=c.repo_name,revision=cs.raw_id))}

			




	
	
	
		
 
        </td>

			




        

    


    
    

    

        

                

                    kallithea/templates/changeset/changeset_file_comment.html
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -13,25 +13,25 @@

			




	
	
	
		
 
          <div class="user">

			




	
	
	
		
 
              ${co.author.username_and_name}

			




	
	
	
		
 
          </div>

			




	
	
	
		
 

			




	
	
	
		
 
          <span>

			




	
	
	
		
 
              ${h.age(co.modified_at)}

			




	
	
	
		
 
              %if co.pull_request:

			




	
	
	
		
 
                ${_('on pull request')}

			




	
	
	
		
 
                <a href="${co.pull_request.url()}">"${co.pull_request.title or _("No title")}"</a>

			




	
	
	
		
 
              %else:

			




	
	
	
		
 
                ${_('on this changeset')}

			




	
	
	
		
 
              %endif

			




	
	
	
		
 
              <a class="permalink" href="#comment-${co.comment_id}">&para;</a>

			




	
	
	
		
 
              <a class="permalink" href="${co.url()}">&para;</a>

			




	
	
	
		
 
          </span>

			




	
	
	
		
 

			




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

			




	
	
	
		
 
            <div onClick="confirm('${_("Delete comment?")}') && deleteComment(${co.comment_id})" class="buttons delete-comment btn btn-mini">${_('Delete')}</div>

			




	
	
	
		
 
          %endif

			




	
	
	
		
 
      </div>

			




	
	
	
		
 
      <div class="text">

			




	
	
	
		
 
        %if co.status_change:

			




	
	
	
		
 
           <div class="rst-block automatic-comment">

			




	
	
	
		
 
             <p>

			




	
	
	
		
 
               <span title="${_('Changeset status')}" class="changeset-status-lbl">${_("Status change")}: ${co.status_change[0].status_lbl}</span>

			




	
	
	
		
 
               <span class="changeset-status-ico"><i class="icon-circle changeset-status-${co.status_change[0].status}"></i></span>

			




        

    


    
    

    

        

                

                    kallithea/templates/compare/compare_cs.html
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -19,25 +19,25 @@

			




	
	
	
		
 
    <table class="compare_view_commits noborder">

			




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

			




	
	
	
		
 
        <tr id="chg_${cnt+1}">

			




	
	
	
		
 
        <td style="width:50px">

			




	
	
	
		
 
          %if cs.raw_id in c.statuses:

			




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

			




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

			




	
	
	
		
 
            </div>

			




	
	
	
		
 
          %endif

			




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

			




	
	
	
		
 
              <div class="comments-container">

			




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

			




	
	
	
		
 
                      <a href="${h.url('changeset_home',repo_name=c.cs_repo.repo_name,revision=cs.raw_id,anchor='comment-%s' % c.cs_comments[cs.raw_id][0].comment_id)}">

			




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

			




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

			




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

			




	
	
	
		
 
                      </a>

			




	
	
	
		
 
                  </div>

			




	
	
	
		
 
              </div>

			




	
	
	
		
 
          %endif

			




	
	
	
		
 
        </td>

			




	
	
	
		
 
        <td style="width: 140px"><span class="tooltip" title="${h.tooltip(h.age(cs.date))}">${cs.date}</span></td>

			




	
	
	
		
 
        <td><div class="gravatar" commit_id="${cs.raw_id}">${h.gravatar(h.email_or_none(cs.author), size=14)}</div></td>

			




	
	
	
		
 
        <td><div class="author">${h.person(cs.author)}</div></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>

			




        

    



    


    



    



      

      





    
    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.