Skip to content

Commit

Permalink
Rename MinLength and MaxLength method.
Browse files Browse the repository at this point in the history
Less parameters on SubmitField.
  • Loading branch information
gomezjdaniel committed Feb 1, 2013
1 parent 8ff2313 commit 6f2390d
Showing 1 changed file with 7 additions and 16 deletions.
23 changes: 7 additions & 16 deletions ngforms.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@

import re

import webapp2
Expand Down Expand Up @@ -56,19 +57,19 @@ 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

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

Expand Down Expand Up @@ -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 = ('&nbsp;&nbsp;&nbsp;<a href="%s" class="btn">%s</a>' %
(self.cancelUrl, self.cancelLabel))

submit = '''
<div class="form-actions">
<button ng-click="trySubmit(); val = true;" class="btn btn-primary"
ng-disabled="val && !f.$valid">%s</button>
%s
</div>
''' % (self.label, cancel)
''' % self.label

return submit

0 comments on commit 6f2390d

Please sign in to comment.