Mercurial > kallithea
changeset 4318:afbd43437237
pull requests: cleanup of messages and code
| author | Mads Kiilerich <madski@unity3d.com> |
|---|---|
| date | Tue, 10 Dec 2013 19:30:37 +0100 |
| parents | 205521e789ec |
| children | 10cff43c7bd9 |
| files | kallithea/model/changeset_status.py kallithea/templates/changeset/changeset_file_comment.html |
| diffstat | 2 files changed, 5 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/kallithea/model/changeset_status.py Tue Dec 10 19:30:37 2013 +0100 +++ b/kallithea/model/changeset_status.py Tue Dec 10 19:30:37 2013 +0100 @@ -109,9 +109,7 @@ # 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,
--- a/kallithea/templates/changeset/changeset_file_comment.html Tue Dec 10 19:30:37 2013 +0100 +++ b/kallithea/templates/changeset/changeset_file_comment.html Tue Dec 10 19:30:37 2013 +0100 @@ -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')}: