Fixed #1477: URLFields now accept a maxlength parameter. Thanks, Matt Croydon.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@4295 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
parent
0421b2597f
commit
f6390e8983
|
@ -21,6 +21,5 @@ DATA_TYPES = {
|
||||||
'SmallIntegerField': 'smallint',
|
'SmallIntegerField': 'smallint',
|
||||||
'TextField': 'text',
|
'TextField': 'text',
|
||||||
'TimeField': 'time',
|
'TimeField': 'time',
|
||||||
'URLField': 'varchar(200)',
|
|
||||||
'USStateField': 'varchar(2)',
|
'USStateField': 'varchar(2)',
|
||||||
}
|
}
|
||||||
|
|
|
@ -25,6 +25,5 @@ DATA_TYPES = {
|
||||||
'SmallIntegerField': 'smallint',
|
'SmallIntegerField': 'smallint',
|
||||||
'TextField': 'longtext',
|
'TextField': 'longtext',
|
||||||
'TimeField': 'time',
|
'TimeField': 'time',
|
||||||
'URLField': 'varchar(200)',
|
|
||||||
'USStateField': 'varchar(2)',
|
'USStateField': 'varchar(2)',
|
||||||
}
|
}
|
||||||
|
|
|
@ -21,6 +21,5 @@ DATA_TYPES = {
|
||||||
'SmallIntegerField': 'smallint',
|
'SmallIntegerField': 'smallint',
|
||||||
'TextField': 'long',
|
'TextField': 'long',
|
||||||
'TimeField': 'timestamp',
|
'TimeField': 'timestamp',
|
||||||
'URLField': 'varchar(200)',
|
|
||||||
'USStateField': 'varchar(2)',
|
'USStateField': 'varchar(2)',
|
||||||
}
|
}
|
||||||
|
|
|
@ -25,6 +25,5 @@ DATA_TYPES = {
|
||||||
'SmallIntegerField': 'smallint',
|
'SmallIntegerField': 'smallint',
|
||||||
'TextField': 'text',
|
'TextField': 'text',
|
||||||
'TimeField': 'time',
|
'TimeField': 'time',
|
||||||
'URLField': 'varchar(200)',
|
|
||||||
'USStateField': 'varchar(2)',
|
'USStateField': 'varchar(2)',
|
||||||
}
|
}
|
||||||
|
|
|
@ -24,6 +24,5 @@ DATA_TYPES = {
|
||||||
'SmallIntegerField': 'smallint',
|
'SmallIntegerField': 'smallint',
|
||||||
'TextField': 'text',
|
'TextField': 'text',
|
||||||
'TimeField': 'time',
|
'TimeField': 'time',
|
||||||
'URLField': 'varchar(200)',
|
|
||||||
'USStateField': 'varchar(2)',
|
'USStateField': 'varchar(2)',
|
||||||
}
|
}
|
||||||
|
|
|
@ -800,16 +800,20 @@ class TimeField(Field):
|
||||||
def formfield(self, initial=None):
|
def formfield(self, initial=None):
|
||||||
return forms.TimeField(required=not self.blank, label=capfirst(self.verbose_name), initial=initial)
|
return forms.TimeField(required=not self.blank, label=capfirst(self.verbose_name), initial=initial)
|
||||||
|
|
||||||
class URLField(Field):
|
class URLField(CharField):
|
||||||
def __init__(self, verbose_name=None, name=None, verify_exists=True, **kwargs):
|
def __init__(self, verbose_name=None, name=None, verify_exists=True, **kwargs):
|
||||||
|
kwargs['maxlength'] = kwargs.get('maxlength', 200)
|
||||||
if verify_exists:
|
if verify_exists:
|
||||||
kwargs.setdefault('validator_list', []).append(validators.isExistingURL)
|
kwargs.setdefault('validator_list', []).append(validators.isExistingURL)
|
||||||
self.verify_exists = verify_exists
|
self.verify_exists = verify_exists
|
||||||
Field.__init__(self, verbose_name, name, **kwargs)
|
CharField.__init__(self, verbose_name, name, **kwargs)
|
||||||
|
|
||||||
def get_manipulator_field_objs(self):
|
def get_manipulator_field_objs(self):
|
||||||
return [oldforms.URLField]
|
return [oldforms.URLField]
|
||||||
|
|
||||||
|
def get_internal_type(self):
|
||||||
|
return "CharField"
|
||||||
|
|
||||||
def formfield(self, initial=None):
|
def formfield(self, initial=None):
|
||||||
return forms.URLField(required=not self.blank, verify_exists=self.verify_exists, label=capfirst(self.verbose_name), initial=initial)
|
return forms.URLField(required=not self.blank, verify_exists=self.verify_exists, label=capfirst(self.verbose_name), initial=initial)
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue