Ticket #1679: multiline_fields.patch

django/db/models/fields/__init__.py

@@ -67 +67 @@
         maxlength=None, unique=False, blank=False, null=False, db_index=False,
         core=False, rel=None, default=NOT_PROVIDED, editable=True,
         prepopulate_from=None, unique_for_date=None, unique_for_month=None,
-        unique_for_year=None, validator_list=None, choices=None, radio_admin=None,
+        unique_for_year=None, validator_list=None, choices=None,
+        radio_admin=None, multiline_admin=None,
         help_text='', db_column=None):
         self.name = name
         self.verbose_name = verbose_name
@@ -82 +83 @@
         self.unique_for_year = unique_for_year
         self.choices = choices or []
         self.radio_admin = radio_admin
+        self.multiline_admin = multiline_admin
         self.help_text = help_text
         self.db_column = db_column
 
@@ -377 +379 @@
         return [forms.CheckboxField]
 
 class CharField(Field):
+    def __init__(self, *args, **kwargs):
+        if 'multiline_admin' not in kwargs:
+            kwargs['multiline_admin'] = False
+        Field.__init__(self, *args, **kwargs)
+
     def get_manipulator_field_objs(self):
-        return [forms.TextField]
+        if self.multiline_admin:
+            return [forms.LargeTextField]
+        else:
+            return [forms.TextField]
 
     def to_python(self, value):
         if isinstance(value, basestring):
@@ -710 +720 @@
         return [forms.SmallIntegerField]
 
 class TextField(Field):
+    def __init__(self, *args, **kwargs):
+        if 'multiline_admin' not in kwargs:
+            kwargs['multiline_admin'] = True
+        Field.__init__(self, *args, **kwargs)
+
     def get_manipulator_field_objs(self):
-        return [forms.LargeTextField]
+        if self.multiline_admin:
+            return [forms.LargeTextField]
+        else:
+            return [forms.TextField]
 
 class TimeField(Field):
     empty_strings_allowed = False