ttygroup
/
boartty
Code Issues Proposed changes

Merge "Handle more than one change result when searching"

This commit is contained in:
Jenkins 2016-03-10 16:39:32 +00:00 committed by Gerrit Code Review
parent 06f1c6c552 3b29386bdc
commit 3561617b2c
2 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
gertty/app.py
View File

@ -465,12 +465,12 @@ class App(object):
return
with self.db.getSession() as session:
if number:
change = session.getChangeByNumber(number)
changes = [session.getChangeByNumber(number)]
elif changeid:
change = session.getChangeByChangeID(changeid)
change_key = change and change.key or None
restid = change and change.id or None
if change_key is None:
changes = session.getChangesByChangeID(changeid)
change_keys = [c.key for c in changes if c]
restids = [c.id for c in changes if c]
if not change_keys:
if self.sync.offline:
raise Exception('Can not sync change while offline.')
dialog = mywid.SystemMessage("Syncing change...")
@ -491,14 +491,15 @@ class App(object):
self.backScreen()
with self.db.getSession() as session:
if number:
change = session.getChangeByNumber(number)
changes = [session.getChangeByNumber(number)]
elif changeid:
change = session.getChangeByChangeID(changeid)
change_key = change and change.key or None
elif restid:
task = sync.SyncChangeTask(restid, sync.HIGH_PRIORITY)
self.sync.submitTask(task)
if change_key is None:
changes = session.getChangesByChangeID(changeid)
change_keys = [c.key for c in changes if c]
elif restids:
for restid in restids:
task = sync.SyncChangeTask(restid, sync.HIGH_PRIORITY)
self.sync.submitTask(task)
if not change_keys:
raise Exception('Change is not in local database.')
def doSearch(self, query):

4
gertty/db.py
View File

@ -835,9 +835,9 @@ class DatabaseSession(object):
return set([])
return set([r[0] for r in self.session().query(Change.id).filter(Change.id.in_(ids)).all()])
def getChangeByChangeID(self, change_id):
def getChangesByChangeID(self, change_id):
try:
return self.session().query(Change).filter_by(change_id=change_id).one()
return self.session().query(Change).filter_by(change_id=change_id)
except sqlalchemy.orm.exc.NoResultFound:
return None