From 6f2390d185f8103b94582811dce4b4c7255ec8c9 Mon Sep 17 00:00:00 2001 From: Daniel Gomez Jurado Date: Fri, 1 Feb 2013 22:08:32 +0100 Subject: [PATCH] Rename MinLength and MaxLength method. Less parameters on SubmitField. --- ngforms.py | 23 +++++++---------------- 1 file changed, 7 insertions(+), 16 deletions(-) diff --git a/ngforms.py b/ngforms.py index fdc8cce..be8cc3c 100644 --- a/ngforms.py +++ b/ngforms.py @@ -1,3 +1,4 @@ + import re import webapp2 @@ -56,9 +57,9 @@ def validate(self, form): raise NotImplemented() -class MinLength(Validation): +class LargerThan(Validation): def __init__(self, min, message): - super(MinLength, self).__init__("minlength", message, + super(LargerThan, self).__init__("minlength", message, {"ng-minlength" : min}) self.min = min @@ -66,9 +67,9 @@ def validate(self, form): return len(form.field(self.input)) >= min -class MaxLength(Validation): +class ShorterThan(Validation): def __init__(self, max, message): - super(MaxLength, self).__init__("maxlength", message, + super(ShorterThan, self).__init__("maxlength", message, {"ng-maxlength" : max}) self.max = max @@ -207,31 +208,21 @@ def build(self, form): class SubmitField(Field): - def __init__(self, label, cancelUrl='', cancelLabel=''): + def __init__(self, label): super(SubmitField, self).__init__('submit', 'submit') self.label = label - self.cancelUrl = cancelUrl - self.cancelLabel = cancelLabel def build(self, form): attrs = { "label": self.label, - "cancelUrl": self.cancelUrl, - "cancelLabel": self.cancelLabel, } - - cancel = '' - if self.cancelUrl != '' and self.cancelLabel != '': - cancel = ('   %s' % - (self.cancelUrl, self.cancelLabel)) submit = '''
- %s
- ''' % (self.label, cancel) + ''' % self.label return submit