--- a/iro/controller/viewinterface.py Tue Feb 07 01:56:59 2012 +0100
+++ b/iro/controller/viewinterface.py Wed Feb 08 14:19:09 2012 +0100
@@ -2,7 +2,7 @@
from ..model.decorators import vUser, vRoute, dbdefer, vTyp
from ..model.message import SMS, Fax, Mail
-from ..validate import validate, vBool, vHash, vTel, vEmail
+from ..validate import validate, vBool, vTel, vEmail, vInteger
from .task import createJob
@@ -11,7 +11,7 @@
'''
@validate(kwd="detailed", func=vBool, need=False)
- @validate(kwd="id", func=vHash, need=False, maxlength=40)
+ @validate(kwd="id", func=vInteger, minv=0, need=False, none_allowed=True)
@vUser
@dbdefer
def status(self, session, user, id=None, detailed=False):
@@ -33,14 +33,14 @@
ret={}
if not id:
for job in user.jobs:
- ret[job.hash]={"status":job.status}
+ ret[str(job.id)]={"status":job.status}
else:
- ret[id]={"status":user.job(id).status}
-
+ ret[str(id)]={"status":user.job(id).status}
+
return ret
@vUser
- @validate(kwd="id", func=vHash,maxlength=40)
+ @validate(kwd="id", func=vInteger, minv=0)
def stop(self, user, id):
'''Stoppt den angegeben Auftrag.