diff --git a/kallithea/model/changeset_status.py b/kallithea/model/changeset_status.py --- a/kallithea/model/changeset_status.py +++ b/kallithea/model/changeset_status.py @@ -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, diff --git a/kallithea/templates/changeset/changeset_file_comment.html b/kallithea/templates/changeset/changeset_file_comment.html --- a/kallithea/templates/changeset/changeset_file_comment.html +++ b/kallithea/templates/changeset/changeset_file_comment.html @@ -18,13 +18,13 @@
%if co.pull_request: - %if co.status_change: - ${_('Vote on pull request #%s') % co.pull_request.pull_request_id}: + ${_('Status change from pull request')} + "${co.pull_request.title or _("No title")}": %else: - ${_('Comment on pull request #%s') % co.pull_request.pull_request_id} + ${_('Comment from pull request')} + "${co.pull_request.title or _("No title")}" %endif - %else: %if co.status_change: ${_('Status change on changeset')}: