ttygroup
/
gertty
Code Issues Proposed changes

Merge "Handle approvals with no name"

This commit is contained in:
Jenkins 2017-08-16 18:50:23 +00:00 committed by Gerrit Code Review
parent a9d6de3ed5 3b97166127
commit cf701e45c1
2 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
gertty/db.py
View File

@ -537,6 +537,18 @@ class Approval(object):
self.value = value
self.draft = draft
@property
def reviewer_name(self):
reviewer_name = 'Anonymous Coward'
if self.reviewer:
if self.reviewer.name:
reviewer_name = self.reviewer.name
elif self.reviewer.username:
reviewer_name = self.reviewer.username
elif self.reviewer.email:
reviewer_name = self.reviewer.email
return reviewer_name
class PendingCherryPick(object):
def __init__(self, revision, branch, message):
self.revision_key = revision.key

8
gertty/view/change.py
View File

@ -682,13 +682,13 @@ class ChangeView(urwid.WidgetWrap):
approval_headers.append(urwid.Text(('table-header', label.category)))
categories.append(label.category)
votes = mywid.Table(approval_headers)
approvals_for_name = {}
approvals_for_account = {}
pending_message = change.revisions[-1].getPendingMessage()
for approval in change.approvals:
# Don't display draft approvals unless they are pending-upload
if approval.draft and not pending_message:
continue
approvals = approvals_for_name.get(approval.reviewer.name)
approvals = approvals_for_account.get(approval.reviewer.id)
if not approvals:
approvals = {}
row = []
@ -696,12 +696,12 @@ class ChangeView(urwid.WidgetWrap):
style = 'reviewer-own-name'
else:
style = 'reviewer-name'
row.append(urwid.Text((style, approval.reviewer.name)))
row.append(urwid.Text((style, approval.reviewer_name)))
for i, category in enumerate(categories):
w = urwid.Text(u'', align=urwid.CENTER)
approvals[category] = w
row.append(w)
approvals_for_name[approval.reviewer.name] = approvals
approvals_for_account[approval.reviewer.id] = approvals
votes.addRow(row)
if str(approval.value) != '0':
cat_min, cat_max = change.getMinMaxPermittedForCategory(approval.category)