# HG changeset patch
# User Sandro Knauß <knauss@netzguerilla.net>
# Date 1330653640 -3600
# Node ID 36137846862781cad968de5e371011fa80f5c4b0
# Parent  02ae72e8bab90f61743608286e19f1c3094aeb34
modifing validator to vRoute

diff -r 02ae72e8bab9 -r 361378468627 iro/controller/viewinterface.py
--- 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.
 
diff -r 02ae72e8bab9 -r 361378468627 tests/viewinterface.py
--- 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)