Skip to content

Commit

Permalink
Fix the form labels for pages with multiples forms.
Browse files Browse the repository at this point in the history
  • Loading branch information
ernestoalejo committed Feb 10, 2013
1 parent fa25034 commit 77f7e47
Showing 1 changed file with 9 additions and 8 deletions.
17 changes: 9 additions & 8 deletions ngforms.py
Original file line number Diff line number Diff line change
Expand Up @@ -153,10 +153,11 @@ def __init__(self, id, name):

def build(self, form):
vals = form.validations[self.id]
id = '%s%s' % (form.form_name, self.id)

errs = []
for val in vals:
errs.append('%s.%s.$error.%s' % (form.form_name, self.id, val.name))
errs.append('%s.%s.$error.%s' % (form.form_name, id, val.name))
errs = " || ".join(errs)

attrs = {}
Expand All @@ -166,7 +167,7 @@ def build(self, form):
messages = []
for v in vals:
messages.append('<span ng-show="%s.%s.$error.%s">%s</span>' %
(form.form_name, self.id, v.name, v.message))
(form.form_name, id, v.name, v.message))
messages = ''.join(messages)

if len(self.name) == 0:
Expand All @@ -181,7 +182,7 @@ def build(self, form):
</div>
""" % {
'errs': errs,
'id': self.id,
'id': id,
'form_name': form.form_name,
'messages': messages,
}
Expand All @@ -200,7 +201,7 @@ def build(self, form):
</div>
""" % {
'errs': errs,
'id': self.id,
'id': id,
'form_name': form.form_name,
'messages': messages,
'name': self.name,
Expand All @@ -218,8 +219,8 @@ def __init__(self, id, cls, name, type='text', placeholder=''):
def build(self, form):
attrs = {
"type": self.type,
"id": self.id,
"name": self.id,
"id": '%s%s' % (form.form_name, self.id),
"name": '%s%s' % (form.form_name, self.id),
"placeholder": self.placeholder,
"class": ' '.join(self.cls),
"ng-model": '%s.%s' % (form.data_obj, self.id),
Expand All @@ -244,8 +245,8 @@ def __init__(self, id, cls, name, rows, placeholder=''):

def build(self, form):
attrs = {
"id": self.id,
"name": self.id,
"id": '%s%s' % (form.form_name, self.id),
"name": '%s%s' % (form.form_name, self.id),
"placeholder": self.placeholder,
"class": ' '.join(self.cls),
"ng-model": '%s.%s' % (form.data_obj, self.id),
Expand Down

0 comments on commit 77f7e47

Please sign in to comment.