--- a/iro/controller/viewinterface.py Fri Mar 02 02:50:17 2012 +0100
+++ b/iro/controller/viewinterface.py Fri Mar 02 03:00:40 2012 +0100
@@ -41,7 +41,7 @@
@validate(kwd="recipients",func=vTel)
@vUser
- @vRoute(typ="sms")
+ @validate(kwd="route",func=vRoute(typ="sms"))
def sms(self, user, message, recipients, route="default", info=""):
'''Versendet eine SMS.
@@ -64,7 +64,7 @@
@validate(kwd="recipients",func=vTel)
@vUser
- @vRoute(typ="fax")
+ @validate(kwd="route",func=vRoute(typ="fax"))
def fax(self, user, subject, fax, recipients, route="default", info=""):
'''Versendet ein FAX.
@@ -89,7 +89,7 @@
@validate(kwd="recipients",func=vEmail, allowString=False)
@validate(kwd="frm",func=vEmail, need=False, allowList=False)
@vUser
- @vRoute(typ="mail")
+ @validate(kwd="route",func=vRoute(typ="mail"))
def mail(self, user, subject, body, recipients, frm=None, route="default", info=""):
'''Versendet eine Email.
--- a/tests/viewinterface.py Fri Mar 02 02:50:17 2012 +0100
+++ b/tests/viewinterface.py Fri Mar 02 03:00:40 2012 +0100
@@ -203,7 +203,7 @@
u.rights.append(Userright(o))
session.add(u)
- jobid = yield Interface().sms('abcdef123456789','message',['0123325456'],['basic'])
+ jobid = yield Interface().sms('abcdef123456789','message',['0123325456'],['sipgate_basic'])
with self.session() as session:
u = session.merge(u)