mirror of
https://github.com/django/django.git
synced 2025-07-04 09:49:12 +00:00
gis: Removed vestige code containing references to the now defunct 'NoField' database creation type and Field.get_placeholder
(which should only exist on the GeometryField
subclass).
git-svn-id: http://code.djangoproject.com/svn/django/branches/gis@8002 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
parent
2995f4e509
commit
fff69c18c1
@ -25,5 +25,4 @@ DATA_TYPES = {
|
|||||||
'TextField': 'longtext',
|
'TextField': 'longtext',
|
||||||
'TimeField': 'time',
|
'TimeField': 'time',
|
||||||
'USStateField': 'varchar(2)',
|
'USStateField': 'varchar(2)',
|
||||||
'NoField': None,
|
|
||||||
}
|
}
|
||||||
|
@ -33,7 +33,6 @@ DATA_TYPES = {
|
|||||||
'TimeField': 'TIMESTAMP',
|
'TimeField': 'TIMESTAMP',
|
||||||
'URLField': 'VARCHAR2(%(max_length)s)',
|
'URLField': 'VARCHAR2(%(max_length)s)',
|
||||||
'USStateField': 'CHAR(2)',
|
'USStateField': 'CHAR(2)',
|
||||||
'NoField': None,
|
|
||||||
}
|
}
|
||||||
|
|
||||||
TEST_DATABASE_PREFIX = 'test_'
|
TEST_DATABASE_PREFIX = 'test_'
|
||||||
|
@ -25,5 +25,4 @@ DATA_TYPES = {
|
|||||||
'TextField': 'text',
|
'TextField': 'text',
|
||||||
'TimeField': 'time',
|
'TimeField': 'time',
|
||||||
'USStateField': 'varchar(2)',
|
'USStateField': 'varchar(2)',
|
||||||
'NoField': '',
|
|
||||||
}
|
}
|
||||||
|
@ -24,5 +24,4 @@ DATA_TYPES = {
|
|||||||
'TextField': 'text',
|
'TextField': 'text',
|
||||||
'TimeField': 'time',
|
'TimeField': 'time',
|
||||||
'USStateField': 'varchar(2)',
|
'USStateField': 'varchar(2)',
|
||||||
'NoField': None,
|
|
||||||
}
|
}
|
||||||
|
@ -280,10 +280,6 @@ class Field(object):
|
|||||||
"""
|
"""
|
||||||
return [name_prefix + self.name]
|
return [name_prefix + self.name]
|
||||||
|
|
||||||
def get_placeholder(self, value):
|
|
||||||
"Returns the placeholder substitution string for the field with the given value."
|
|
||||||
return '%s'
|
|
||||||
|
|
||||||
def prepare_field_objs_and_params(self, manipulator, name_prefix):
|
def prepare_field_objs_and_params(self, manipulator, name_prefix):
|
||||||
params = {'validator_list': self.validator_list[:]}
|
params = {'validator_list': self.validator_list[:]}
|
||||||
if self.max_length and not self.choices: # Don't give SelectFields a max_length parameter.
|
if self.max_length and not self.choices: # Don't give SelectFields a max_length parameter.
|
||||||
|
@ -729,9 +729,6 @@ class ManyToManyField(RelatedField, Field):
|
|||||||
msg = ugettext_lazy('Hold down "Control", or "Command" on a Mac, to select more than one.')
|
msg = ugettext_lazy('Hold down "Control", or "Command" on a Mac, to select more than one.')
|
||||||
self.help_text = string_concat(self.help_text, ' ', msg)
|
self.help_text = string_concat(self.help_text, ' ', msg)
|
||||||
|
|
||||||
def get_internal_type(self):
|
|
||||||
return "NoField"
|
|
||||||
|
|
||||||
def get_manipulator_field_objs(self):
|
def get_manipulator_field_objs(self):
|
||||||
choices = self.get_choices_default()
|
choices = self.get_choices_default()
|
||||||
return [curry(oldforms.SelectMultipleField, size=min(max(len(choices), 5), 15), choices=choices)]
|
return [curry(oldforms.SelectMultipleField, size=min(max(len(choices), 5), 15), choices=choices)]
|
||||||
|
Loading…
x
Reference in New Issue
Block a user