1
0
mirror of https://github.com/django/django.git synced 2025-07-05 10:19:20 +00:00

Merged 1022

git-svn-id: http://code.djangoproject.com/svn/django/branches/new-admin@1024 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
Robert Wittams 2005-10-30 14:21:26 +00:00
parent 5e5f77f59b
commit 938b46d72f

View File

@ -338,8 +338,8 @@ class TextField(FormField):
maxlength = 'maxlength="%s" ' % self.maxlength maxlength = 'maxlength="%s" ' % self.maxlength
if isinstance(data, unicode): if isinstance(data, unicode):
data = data.encode(DEFAULT_CHARSET) data = data.encode(DEFAULT_CHARSET)
return '<input type="text" id="%s" class="v%s%s" name="%s" size="%s" value="%s" %s/>' % \ return '<input type="%s" id="%s" class="v%s%s" name="%s" size="%s" value="%s" %s/>' % \
(self.get_id(), self.__class__.__name__, self.is_required and ' required' or '', (self.input_type, self.get_id(), self.__class__.__name__, self.is_required and ' required' or '',
self.field_name, self.length, escape(data), maxlength) self.field_name, self.length, escape(data), maxlength)
def html2python(data): def html2python(data):
@ -347,11 +347,7 @@ class TextField(FormField):
html2python = staticmethod(html2python) html2python = staticmethod(html2python)
class PasswordField(TextField): class PasswordField(TextField):
def render(self, data): input_type="password"
# value is always blank because we never want to redisplay it
return '<input type="password" id="%s" class="v%s%s" name="%s" value="" />' % \
(self.get_id(), self.__class__.__name__, self.is_required and ' required' or '',
self.field_name)
class LargeTextField(TextField): class LargeTextField(TextField):
def __init__(self, field_name, rows=10, cols=40, is_required=False, validator_list=[], maxlength=None): def __init__(self, field_name, rows=10, cols=40, is_required=False, validator_list=[], maxlength=None):