kallithea Changeset - 0590e974ac35

Changeset - 0590e974ac35

Parent rev.

Child rev.

[Not reviewed]

default

0 2 0

Mads Kiilerich - 9 years ago 2016-05-23 18:02:33
madski@unity3d.com

pullrequests: refactor how reviewer status is passed around internally

2 files changed with 5 insertions and 5 deletions:

kallithea/model/changeset_status.py

kallithea/templates/pullrequests/pullrequest_show.html

0 comments (0 inline, 0 general)

kallithea/model/changeset_status.py

➞

Show inline comments

@@ @@ -98,17 +98,17 @@ class ChangesetStatusModel(BaseModel): @@
         pull_request_reviewers = []
         pull_request_pending_reviewers = []
         relevant_statuses = []
         for user in pull_request.get_reviewer_users():
             st = cs_statuses.get(user.username)
             relevant_statuses.append(st)
             if not st or st.status in (ChangesetStatus.STATUS_NOT_REVIEWED,
             status = ChangesetStatus.STATUS_NOT_REVIEWED if st is None else st.status
             if status in (ChangesetStatus.STATUS_NOT_REVIEWED,
                                        ChangesetStatus.STATUS_UNDER_REVIEW):
                 st = None
                 pull_request_pending_reviewers.append(user)
-            pull_request_reviewers.append((user, st))
+            pull_request_reviewers.append((user, status))
         result = self._calculate_status(relevant_statuses)
         return (pull_request_reviewers,
                 pull_request_pending_reviewers,
                 result)

kallithea/templates/pullrequests/pullrequest_show.html

➞

Show inline comments

@@ @@ -227,14 +227,14 @@ ${self.repo_context_bar('showpullrequest @@
             %for member,status in c.pull_request_reviewers:
               ## WARNING: the HTML below is duplicate with
               ## kallithea/public/js/base.js
               ## If you change something here it should be reflected in the template too.
               <li id="reviewer_${member.user_id}">
                 <div class="reviewers_member">
                     <div class="reviewer_status tooltip" title="${h.changeset_status_lbl(status.status if status else 'not_reviewed')}">
                       <i class="icon-circle changeset-status-${status.status if status else 'not_reviewed'}"></i>
                     <div class="reviewer_status tooltip" title="${h.changeset_status_lbl(status)}">
                       <i class="icon-circle changeset-status-${status}"></i>
                     </div>
                   ${h.gravatar_div(member.email, size=14, div_class="reviewer_gravatar gravatar")}
                   <div style="float:left;">
                     ${member.full_name_and_username}
                     %if c.pull_request.user_id == member.user_id:
                       (${_('Owner')})

0 comments (0 inline, 0 general)