kallithea Changeset - afbd43437237

Changeset - afbd43437237

Parent rev.

Child rev.

[Not reviewed]

default

0 2 0

Mads Kiilerich - 12 years ago 2013-12-10 19:30:37
madski@unity3d.com

pull requests: cleanup of messages and code

2 files changed with 5 insertions and 7 deletions:

kallithea/model/changeset_status.py

kallithea/templates/changeset/changeset_file_comment.html

0 comments (0 inline, 0 general)

kallithea/model/changeset_status.py

➞

Show inline comments

@@ @@ -109,9 +109,7 @@ class ChangesetStatusModel(BaseModel): @@
         # returned from pull_request
         status = q.first()
         if as_str:
             status = status.status if status else status
             st = status or ChangesetStatus.DEFAULT
             return str(st)
             return str(status.status) if status else ChangesetStatus.DEFAULT
         return status
     def set_status(self, repo, status, user, comment=None, revision=None,

kallithea/templates/changeset/changeset_file_comment.html

➞

Show inline comments

@@ @@ -18,13 +18,13 @@ @@
        <div style="float:left;padding:4px 0px 0px 5px">
         <span class="">
          %if co.pull_request:
             <a href="${h.url('pullrequest_show',repo_name=co.pull_request.other_repo.repo_name,pull_request_id=co.pull_request.pull_request_id)}">
             %if co.status_change:
               ${_('Vote on pull request #%s') % co.pull_request.pull_request_id}:
               ${_('Status change from pull request')}
               <a href="${h.url('pullrequest_show',repo_name=co.pull_request.other_repo.repo_name,pull_request_id=co.pull_request.pull_request_id)}">"${co.pull_request.title or _("No title")}"</a>:
             %else:
               ${_('Comment on pull request #%s') % co.pull_request.pull_request_id}
               ${_('Comment from pull request')}
               <a href="${h.url('pullrequest_show',repo_name=co.pull_request.other_repo.repo_name,pull_request_id=co.pull_request.pull_request_id)}">"${co.pull_request.title or _("No title")}"</a>
             %endif
             </a>
          %else:
             %if co.status_change:
               ${_('Status change on changeset')}:

0 comments (0 inline, 0 general)