ttygroup/boartty
Code Issues Proposed changes

Merge "Don't show closed changes in the open list"

Browse Source
This commit is contained in:
Jenkins 2014-05-27 16:06:14 +00:00 committed by Gerrit Code Review
commit 25a5efede6
3 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
gertty/db.py
View File

@ -288,12 +288,12 @@ mapper(Project, project_table, properties=dict(
change_table.c.reviewed==False),
order_by=change_table.c.number,
),
reviewed_changes=relationship(Change,
primaryjoin=and_(project_table.c.key==change_table.c.project_key,
change_table.c.hidden==False,
change_table.c.reviewed==True),
order_by=change_table.c.number,
),
open_changes=relationship(Change,
primaryjoin=and_(project_table.c.key==change_table.c.project_key,
change_table.c.status!='MERGED',
change_table.c.status!='ABANDONED'),
order_by=change_table.c.number,
),
updated = column_property(
select([func.max(change_table.c.updated)]).where(
change_table.c.project_key==project_table.c.key)

2
gertty/view/change_list.py
View File

@ -97,7 +97,7 @@ This Screen
lst = project.unreviewed_changes
else:
self.title = u'Open changes in %s' % project.name
lst = project.changes
lst = project.open_changes
self.app.status.update(title=self.title)
i = 0
for change in lst:

6
gertty/view/project_list.py
View File

@ -34,11 +34,11 @@ class ProjectRow(urwid.Button):
name = urwid.Text(u' '+project.name)
name.set_wrap_mode('clip')
self.unreviewed_changes = urwid.Text(u'')
self.reviewed_changes = urwid.Text(u'')
self.open_changes = urwid.Text(u'')
col = urwid.Columns([
name,
('fixed', 4, self.unreviewed_changes),
('fixed', 4, self.reviewed_changes),
('fixed', 4, self.open_changes),
])
self.row_style = urwid.AttrMap(col, '')
self._w = urwid.AttrMap(self.row_style, None, focus_map=self.project_focus_map)
@ -54,7 +54,7 @@ class ProjectRow(urwid.Button):
style = 'unsubscribed-project'
self.row_style.set_attr_map({None: style})
self.unreviewed_changes.set_text(str(len(project.unreviewed_changes)))
self.reviewed_changes.set_text(str(len(project.reviewed_changes)))
self.open_changes.set_text(str(len(project.open_changes)))
class ProjectListView(urwid.WidgetWrap):
help = mywid.GLOBAL_HELP + """