Ticket #2243: django_2243b.patch

django/db/models/fields/related.py

@@ -2 +2 @@
 from django.db.models import signals, get_model
 from django.db.models.fields import AutoField, Field, IntegerField, get_ul_class
 from django.db.models.related import RelatedObject
-from django.utils.translation import gettext_lazy, string_concat
+from django.utils.translation import gettext_lazy, string_concat, ngettext
 from django.utils.functional import curry
 from django.core import validators
 from django import forms
@@ -671 +671 @@
         new_data = {}
         if obj:
             instance_ids = [instance._get_pk_val() for instance in getattr(obj, self.name).all()]
-            if self.rel.raw_id_admin:
-                new_data[self.name] = ",".join([str(id) for id in instance_ids])
-            else:
-                new_data[self.name] = instance_ids
+            new_data[self.name] = instance_ids
         else:
             # In required many-to-many fields with only one available choice,
             # select that one available choice.

django/db/models/manipulators.py

@@ -115 +115 @@
         # Save many-to-many objects. Example: Set sites for a poll.
         for f in self.opts.many_to_many:
             if self.follow.get(f.name, None):
-                if not f.rel.edit_inline:
-                    if f.rel.raw_id_admin:
-                        new_vals = new_data.get(f.name, ())
-                    else:
-                        new_vals = new_data.getlist(f.name)
+                if not f.rel.edit_inline:
+                    # PATCH for 2243: M2M fields give list regardless of raw_id_admin
+                    new_vals = new_data.getlist(f.name)
                     # First, clear the existing values.
                     rel_manager = getattr(new_object, f.name)
                     rel_manager.clear()
@@ -212 +210 @@
                                     if not f.primary_key and f != related.field and str(getattr(old_rel_obj, f.attname)) != str(getattr(new_rel_obj, f.attname)):
                                         self.fields_changed.append('%s for %s "%s"' % (f.verbose_name, related.opts.verbose_name, new_rel_obj))
 
-                        # Save many-to-many objects.
-                        for f in related.opts.many_to_many:
-                            if child_follow.get(f.name, None) and not f.rel.edit_inline:
-                                was_changed = getattr(new_rel_obj, 'set_%s' % f.name)(rel_new_data[f.attname])
-                                if self.change and was_changed:
-                                    self.fields_changed.append('%s for %s "%s"' % (f.verbose_name, related.opts.verbose_name, new_rel_obj))
+                        # Save many-to-many objects - PATCH FOR 2243
+                        for f in related.opts.many_to_many:
+                            if child_follow.get(f.name, None) and not f.rel.edit_inline:
+                                new_vals = rel_new_data.get(f.name, ())
+                                # First, clear the existing values.
+                                rel_manager = getattr(new_rel_obj, f.name)
+                                rel_manager.clear()
+                                # Then, set the new values.
+                                for n in new_vals:
+                                    rel_manager.add(f.rel.to._default_manager.get(pk=n))
+                                # TODO: Add to 'fields_changed'
 
                     # If, in the change stage, all of the core fields were blank and
                     # the primary key (ID) was provided, delete the item.

django/forms/__init__.py

@@ -971 +971 @@
             raise validators.CriticalValidationError, e.messages
 
 class RawIdAdminField(CommaSeparatedIntegerField):
+    # well, renderer should see data as LIST...
+    requires_data_list = True
+
+    # ... whereas validators are to see it as STRING
+    def run_validator(self, new_data, validator):
+        if self.is_required or new_data.get(self.field_name, False) or hasattr(validator, 'always_test'):
+            validator(new_data.get(self.field_name, ''), new_data)
+
+    # here we change actual data from STRING to LIST
+    def convert_post_data(self, new_data):
+        name = self.get_member_name()
+        if new_data.has_key(self.field_name):
+            d = new_data[self.field_name]
+            converted_data = self.__class__.html2python(d)
+            new_data.setlist(name, converted_data)
+        else:
+            new_data.setlist(name, [])
+
     def html2python(data):
         return data.split(',')
     html2python = staticmethod(html2python)
 
+    def render(self, data):
+        # it HAS to be list, but just in case...
+        if isinstance(data, list):
+            data = ','.join(str(d) for d in data)
+        return TextField.render(self, data)
+
 class XMLLargeTextField(LargeTextField):
     """
     A LargeTextField with an XML validator. The schema_path argument is the