Merge branch 'bbmaster' of ssh://git.cy55.de/home/git/cybertools into bbmaster
This commit is contained in:
commit
296ce1a3e8
2 changed files with 5 additions and 0 deletions
1
.gitignore
vendored
1
.gitignore
vendored
|
@ -1,4 +1,5 @@
|
|||
*.pyc
|
||||
*.pyo
|
||||
ajax/dojo/*
|
||||
*.project
|
||||
*.pydevproject
|
||||
|
|
|
@ -270,6 +270,8 @@ class TrackingStorage(BTreeContainer):
|
|||
def getUserTracks(self, taskId, runId, userName):
|
||||
if not runId:
|
||||
runId = self.currentRuns.get(taskId)
|
||||
if runId is None:
|
||||
return []
|
||||
return self.query(taskId=taskId, runId=runId, userName=userName)
|
||||
|
||||
def getLastUserTrack(self, taskId, runId, userName):
|
||||
|
@ -283,6 +285,8 @@ class TrackingStorage(BTreeContainer):
|
|||
result = None
|
||||
for idx in kw:
|
||||
value = kw[idx]
|
||||
if idx == 'runId' and value is None:
|
||||
continue
|
||||
if idx in self.indexAttributes:
|
||||
if type(value) not in (list, tuple):
|
||||
value = [value]
|
||||
|
|
Loading…
Add table
Reference in a new issue