cco/cybertools
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'bbmaster' of ssh://git.cy55.de/home/git/cybertools into bbmaster

Browse source
This commit is contained in:
Helmut Merz 2015-08-29 11:03:43 +02:00
commit 296ce1a3e8
2 changed files with 5 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
.gitignore vendored
View file

@ -1,4 +1,5 @@
*.pyc *.pyc
*.pyo
ajax/dojo/* ajax/dojo/*
*.project *.project
*.pydevproject *.pydevproject

4
tracking/btree.py
View file

@ -270,6 +270,8 @@ class TrackingStorage(BTreeContainer):
def getUserTracks(self, taskId, runId, userName): def getUserTracks(self, taskId, runId, userName):
if not runId: if not runId:
runId = self.currentRuns.get(taskId) runId = self.currentRuns.get(taskId)
if runId is None:
return []
return self.query(taskId=taskId, runId=runId, userName=userName) return self.query(taskId=taskId, runId=runId, userName=userName)
def getLastUserTrack(self, taskId, runId, userName): def getLastUserTrack(self, taskId, runId, userName):
@ -283,6 +285,8 @@ class TrackingStorage(BTreeContainer):
result = None result = None
for idx in kw: for idx in kw:
value = kw[idx] value = kw[idx]
if idx == 'runId' and value is None:
continue
if idx in self.indexAttributes: if idx in self.indexAttributes:
if type(value) not in (list, tuple): if type(value) not in (list, tuple):
value = [value] value = [value]