kallithea Changeset - 0590e974ac35

Changeset - 0590e974ac35

Parent rev.

Child rev.

[Not reviewed]

default

0 2 0

Mads Kiilerich - 10 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

@@ @@ -80,53 +80,53 @@ class ChangesetStatusModel(BaseModel): @@
             return ChangesetStatus.STATUS_REJECTED
         return ChangesetStatus.STATUS_UNDER_REVIEW
     def calculate_pull_request_result(self, pull_request):
         """
         Return a tuple (reviewers, pending reviewers, pull request status)
         Only approve and reject counts as valid votes.
         """
         # collect latest votes from all voters
         cs_statuses = dict()
         for st in reversed(self.get_statuses(pull_request.org_repo,
                                              pull_request=pull_request,
                                              with_revisions=True)):
             cs_statuses[st.author.username] = st
         # collect votes from official reviewers
         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)
     def get_statuses(self, repo, revision=None, pull_request=None,
                      with_revisions=False):
         q = self._get_status_query(repo, revision, pull_request,
                                    with_revisions)
         q = q.options(joinedload('author'))
         return q.all()
     def get_status(self, repo, revision=None, pull_request=None, as_str=True):
         """
         Returns latest status of changeset for given revision or for given
         pull request. Statuses are versioned inside a table itself and
         version == 0 is always the current one
         :param repo:
         :param revision: 40char hash or None
         :param pull_request: pull_request reference
         :param as_str: return status as string not object

kallithea/templates/pullrequests/pullrequest_show.html

➞

Show inline comments

@@ @@ -209,50 +209,50 @@ ${self.repo_context_bar('showpullrequest @@
                     </tr>
                   %endfor
                 </table>
               </div>
               <div class="msg-div">${_("Pull request iterations do not change content once created. Select a revision and save to make a new iteration.")}</div>
               %endif
               <div class="msg-div">${c.update_msg_other}</div>
             </div>
         </div>
       </div>
     </div>
     ## REVIEWERS
     <div style="float:left; border-left:1px dashed #eee">
         <div class="pr-details-title">${_('Pull Request Reviewers')}</div>
         <div id="reviewers" style="padding:0px 0px 5px 10px">
           ## members goes here !
           <div>
             <ul id="review_members" class="group_members">
             %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')})
                     %endif
                   </div>
                   <input type="hidden" value="${member.user_id}" name="review_members" />
                   %if editable:
                   <div class="reviewer_member_remove action_button" onclick="removeReviewMember(${member.user_id})" title="${_('Remove reviewer')}">
                       <i class="icon-minus-circled"></i>
                   </div>
                   %endif
                 </div>
               </li>
             %endfor
             </ul>
           </div>
           %if editable:
           <div class='ac'>
             <div class="reviewer_ac">
                ${h.text('user', class_='yui-ac-input',placeholder=_('Type name of reviewer to add'))}
                <div id="reviewers_container"></div>

0 comments (0 inline, 0 general)