kallithea Changeset - 8560e7a59352

Changeset - 8560e7a59352

Parent rev.

Child rev.

[Not reviewed]

default

0 3 0

Mads Kiilerich - 12 years ago 2013-06-12 02:13:05
madski@unity3d.com

pull requests: add a 'Someone voted' comment on all uses of last_review_status

3 files changed with 4 insertions and 4 deletions:

kallithea/model/db.py

kallithea/templates/pullrequests/pullrequest_data.html

kallithea/templates/pullrequests/pullrequest_show_my_data.html

0 comments (0 inline, 0 general)

kallithea/model/db.py

➞

Show inline comments

@@ @@ -2301,7 +2301,7 @@ class PullRequest(Base, BaseModel): @@
     @property
     def last_review_status(self):
         return self.statuses[-1].status if self.statuses else ''
+        return str(self.statuses[-1].status) if self.statuses else ''
     def __json__(self):
         return dict(

kallithea/templates/pullrequests/pullrequest_data.html

➞

Show inline comments

@@ @@ -3,7 +3,7 @@ @@
 % for pr in c.pullrequests_pager:
   <div class="pr ${'pr-closed' if pr.is_closed() else ''}">
     <div class="pr-title">
-      <img src="${h.url('/images/icons/flag_status_%s.png' % str(pr.last_review_status))}" />
+      <img src="${h.url('/images/icons/flag_status_%s.png' % pr.last_review_status)}" title="${_("Someone voted: %s") % pr.last_review_status}"/>
       <a href="${h.url('pullrequest_show',repo_name=pr.other_repo.repo_name,pull_request_id=pr.pull_request_id)}">
       ${_('Pull request #%s opened by %s on %s') % (pr.pull_request_id, pr.author.full_name, h.fmt_date(pr.created_on))}
       </a>

kallithea/templates/pullrequests/pullrequest_show_my_data.html

➞

Show inline comments

@@ @@ -10,7 +10,7 @@ @@
       <li class="${'closed' if pull_request.is_closed() else ''}">
         <div style="height: 12px">
           <div style="float:left">
-            <img src="${h.url('/images/icons/flag_status_%s.png' % str(pull_request.last_review_status))}" />
+            <img src="${h.url('/images/icons/flag_status_%s.png' % pull_request.last_review_status)}" title="${_("Someone voted: %s") % pull_request.last_review_status}"/>
             <a href="${h.url('pullrequest_show',repo_name=pull_request.other_repo.repo_name,pull_request_id=pull_request.pull_request_id)}">
               ${_('Pull request #%s opened on %s') % (pull_request.pull_request_id, h.fmt_date(pull_request.created_on))}
               %if pull_request.is_closed():
@@ @@ -37,7 +37,7 @@ @@
       %for pull_request in c.participate_in_pull_requests:
       <li class="${'closed' if pull_request.is_closed() else ''}">
         <div style="height: 12px">
-          <img src="${h.url('/images/icons/flag_status_%s.png' % str(pull_request.last_review_status))}" />
+          <img src="${h.url('/images/icons/flag_status_%s.png' % pull_request.last_review_status)}" title="${_("Someone voted: %s") % pull_request.last_review_status}"/>
           <a href="${h.url('pullrequest_show',repo_name=pull_request.other_repo.repo_name,pull_request_id=pull_request.pull_request_id)}">
             ${_('Pull request #%s opened by %s on %s') % (pull_request.pull_request_id, pull_request.author.full_name, h.fmt_date(pull_request.created_on))}
           </a>

0 comments (0 inline, 0 general)