kallithea Changeset - 1528ae42ec04

Changeset - 1528ae42ec04

Parent rev.

Child rev.

[Not reviewed]

default

0 2 0

Mads Kiilerich - 10 years ago 2015-07-24 16:37:40
madski@unity3d.com

pullrequests: drop the useless 'latest vote' column

2 files changed with 1 insertions and 12 deletions:

kallithea/model/db.py

kallithea/templates/pullrequests/pullrequest_data.html

0 comments (0 inline, 0 general)

kallithea/model/db.py

➞

Show inline comments

@@ @@ -2316,16 +2316,12 @@ class PullRequest(Base, BaseModel): @@
     comments = relationship('ChangesetComment',
                              cascade="all, delete-orphan")
     def is_closed(self):
         return self.status == self.STATUS_CLOSED
     @property
     def last_review_status(self):
         return str(self.statuses[-1].status) if self.statuses else ''
     def user_review_status(self, user_id):
         """Return the user's latest status votes on PR"""
         # note: no filtering on repo - that would be redundant
         status = ChangesetStatus.query()\
             .filter(ChangesetStatus.pull_request == self)\
             .filter(ChangesetStatus.user_id == user_id)\

kallithea/templates/pullrequests/pullrequest_data.html

➞

Show inline comments

@@ @@ -8,30 +8,23 @@ @@
 %endif
 <div class="table">
   <table>
     <thead>
       <tr>
         <th></th>
+        <th class="left">${_('Vote')}</th>
         <th class="left">${_('Title')}</th>
         <th class="left">${_('Author')}</th>
         <th class="left">${_('Age')}</th>
         <th class="left">${_('From')}</th>
         <th class="left">${_('To')}</th>
       </tr>
     </thead>
 % for pr in pullrequests:
     <tr class="${'pr-closed' if pr.is_closed() else ''}">
       <td width="80px">
         ## review status
         %if pr.last_review_status:
           <i class="icon-circle changeset-status-${pr.last_review_status}" title="${_("Latest vote: %s") % pr.last_review_status}"></i>
         %else:
           <i class="icon-circle changeset-status-not_reviewed" title="${_("Nobody voted")}"></i>
         %endif
         <% status = pr.user_review_status(c.authuser.user_id) %>
         %if status:
           <i class="icon-circle changeset-status-${status}" title="${_("You voted: %s") % status}"></i>
         %else:
           <i class="icon-circle changeset-status-not_reviewed" title="${_("You didn't vote")}"></i>
         %endif

0 comments (0 inline, 0 general)