ttygroup
/
boartty
Code Issues Proposed changes

Merge "Supply a default query on search"

This commit is contained in:
Jenkins 2015-08-07 15:39:44 +00:00 committed by Gerrit Code Review
parent 0b02fafdc7 c69d9e9536
commit 2cfded253e
2 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
gertty/app.py
View File

@ -128,7 +128,7 @@ class StatusHeader(urwid.WidgetWrap):
class SearchDialog(mywid.ButtonDialog):
signals = ['search', 'cancel']
def __init__(self, app):
def __init__(self, app, default):
self.app = app
search_button = mywid.FixedButton('Search')
cancel_button = mywid.FixedButton('Cancel')
@ -139,6 +139,7 @@ class SearchDialog(mywid.ButtonDialog):
super(SearchDialog, self).__init__("Search",
"Enter a change number or search string.",
entry_prompt="Search: ",
entry_text=default,
buttons=[search_button,
cancel_button])
@ -435,8 +436,8 @@ class App(object):
except gertty.view.DisplayError as e:
return self.error(e.message)
def searchDialog(self):
dialog = SearchDialog(self)
def searchDialog(self, default):
dialog = SearchDialog(self, default)
urwid.connect_signal(dialog, 'cancel',
lambda button: self.backScreen())
urwid.connect_signal(dialog, 'search',
@ -514,7 +515,11 @@ class App(object):
elif keymap.QUIT in commands:
self.quit()
elif keymap.CHANGE_SEARCH in commands:
self.searchDialog()
if hasattr(self.loop.widget, 'getQueryString'):
default = self.loop.widget.getQueryString()
else:
default = ''
self.searchDialog(default)
elif keymap.LIST_HELD in commands:
self.doSearch("is:held")
elif key in self.config.dashboards:

5
gertty/view/change_list.py
View File

@ -292,6 +292,11 @@ class ChangeListView(urwid.WidgetWrap):
row = self.change_rows[key]
del self.change_rows[key]
def getQueryString(self):
if self.project_key is not None:
return "project:%s %s" % (self.query_desc, self.app.config.project_change_list_query)
return self.query
def _threadChanges(self, changes):
ret = []
prefixes = {}