Changeset 748

Timestamp:

09/30/05 12:17:50 (3 years ago)

Author:

rjwittams

Message:

Possible fix for #499. Also gets error handling working properly in the admin without changing field names.

Files:

• django/branches/new-admin/django/core/formfields.py (modified) (2 diffs)
• django/branches/new-admin/django/core/meta/fields.py (modified) (2 diffs)
• django/branches/new-admin/django/core/meta/__init__.py (modified) (1 diff)
• django/branches/new-admin/django/views/admin/main.py (modified) (4 diffs)

django/branches/new-admin/django/core/formfields.py

@@ -301 +301 @@
-    def convert_post_data(self, new_data):
-        name = self.get_member_name()
-
-
+self.field_
+self.field_
-            #del new_data[self.field_name]
-
-
-
+
+
+
+
+
+
+
-        else:
-            try:
@@ -861 +865 @@
-            raise validators.CriticalValidationError, e.messages
-
+    def html2python(data):
+        return data.split(',');
+
-class XMLLargeTextField(LargeTextField):
-    """

django/branches/new-admin/django/core/meta/fields.py

@@ -164 +164 @@
-        Returns a list of field names that this object adds to the manipulator.
-        """
-column
+name
-
-    def get_manipulator_fields(self, opts, manipulator, change, name_prefix='', rel=False):
@@ -639 +639 @@
-        return [formfields.IntegerField]
-
+    def get_db_prep_save(self,value):
+        if value == '':
+            return None
+        else:
+            return int(value)
+    
-    def flatten_data(self, obj = None):
-        if not obj: 

django/branches/new-admin/django/core/meta/__init__.py

@@ -860 +860 @@
-        if cursor.fetchone():
-            db_values = [f.get_db_prep_save(f.pre_save(getattr(self, f.column), False)) for f in non_pks]
-            while 1:
-                try:
-                    idx = db_values.index('')
-                    non_pks[idx:idx+1] = []
-                    db_values[idx:idx +1] = []
-                except: break
-            cursor.execute("UPDATE %s SET %s WHERE %s=%%s" % (opts.db_table, 
-                ','.join(['%s=%%s' % f.column for f in non_pks]), opts.pk.column),

django/branches/new-admin/django/views/admin/main.py

@@ -687 +687 @@
-            new_data.update(request.FILES)
-        errors = manipulator.get_validation_errors(new_data)
+        manipulator.do_html2python(new_data)
+        
-        if not errors and not request.POST.has_key("_preview"):
-            for f in opts.many_to_many:
-                if f.rel.raw_id_admin:
-                    new_data.setlist(f.name, new_data[f.name].split(","))
-            manipulator.do_html2python(new_data)
-            new_object = manipulator.save(new_data)
-            pk_value = getattr(new_object, opts.pk.column)
@@ -712 +713 @@
-                request.user.add_message(msg)
-                return HttpResponseRedirect(post_url)
- if request.POST.has_key("_preview"):
-
+# if request.POST.has_key("_preview"):   # Always happens anyway. 
+#
-    else:
-        # Add default data.
@@ -758 +759 @@
-
-        errors = manipulator.get_validation_errors(new_data)
+        
+        manipulator.do_html2python(new_data)
-        if not errors and not request.POST.has_key("_preview"):
-    for f in opts.many_to_many:
-        if f.rel.raw_id_admin:
-            new_data.setlist(f.name, new_data[f.name].split(","))
-    manipulator.do_html2python(new_data
+# Now done in commaseparatedint
+#    for f in opts.many_to_many: 
+#        if f.rel.raw_id_admin:
+#            new_data.setlist(f.name, new_data[f.name].split(",")
-            new_object = manipulator.save(new_data)
-            pk_value = getattr(new_object, opts.pk.column)
@@ -795 +798 @@
-                request.user.add_message(msg)
-                return HttpResponseRedirect("../")
- if request.POST.has_key("_preview"):
-
+# if request.POST.has_key("_preview"):  # always happens
+#
-    else:
-        # Populate new_data with a "flattened" version of the current data.