diff -r 7a0f8fbdf7b8 -r 3763babd5e10 iro/model/decorators.py --- a/iro/model/decorators.py Fri Mar 02 03:25:21 2012 +0100 +++ b/iro/model/decorators.py Fri Mar 02 13:46:13 2012 +0100 @@ -8,30 +8,28 @@ from ..error import ValidateException -def vRoute(typ): - @dbdefer - def wrapper(session, value, field, allowString=True, allowList=True): - str_ = False - ret = [] +@dbdefer +def vRoute(session, value, field, typ, allowString=True, allowList=True): + str_ = False + ret = [] - if type(value) is types.StringType: - if not allowString: - raise ValidateException(field=field,msg='%s must be a list of routes.'%field) - str_=True - value=[value] - elif not allowList: - raise ValidateException(field=field,msg='%s must be a route - No list of routes.'%field) + if type(value) is types.StringType: + if not allowString: + raise ValidateException(field=field,msg='%s must be a list of routes.'%field) + str_=True + value=[value] + elif not allowList: + raise ValidateException(field=field,msg='%s must be a route - No list of routes.'%field) - routes =[o.name for o in Offer.routes(session,typ)] - for v in value: - if v not in routes: - raise ValidateException(field=field,msg='Route %s is not valid.'%v) - if v not in ret: - ret.append(v) - if str_: - return ret[0] - return ret - return wrapper + routes =[o.name for o in Offer.routes(session,typ)] + for v in value: + if v not in routes: + raise ValidateException(field=field,msg='Route %s is not valid.'%v) + if v not in ret: + ret.append(v) + if str_: + return ret[0] + return ret @dbdefer def vTyp(value,field, session):