Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Fixed error in raw_id_admin on ManyToManyFields caused by [1434] -- t…

…hey weren't working.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@1485 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
commit 1ce5ef6166d07f3858308eea44a9821c12b9cc66 1 parent de7a336
@adrianholovaty adrianholovaty authored
Showing with 7 additions and 3 deletions.
  1. +2 −2 django/core/formfields.py
  2. +5 −1 django/core/meta/__init__.py
View
4 django/core/formfields.py
@@ -887,8 +887,8 @@ def isCommaSeparatedIntegerList(self, field_data, all_data):
class RawIdAdminField(CommaSeparatedIntegerField):
def html2python(data):
- return data.split(',');
- html2python = classmethod(html2python)
+ return data.split(',')
+ html2python = staticmethod(html2python)
class XMLLargeTextField(LargeTextField):
"""
View
6 django/core/meta/__init__.py
@@ -1702,7 +1702,11 @@ def manipulator_save(opts, klass, add, change, self, new_data):
for f in opts.many_to_many:
if self.follow.get(f.name, None):
if not f.rel.edit_inline:
- was_changed = getattr(new_object, 'set_%s' % f.name)(new_data.getlist(f.name))
+ if f.rel.raw_id_admin:
+ new_vals = new_data.get(f.name, ())
+ else:
+ new_vals = new_data.getlist(f.name)
+ was_changed = getattr(new_object, 'set_%s' % f.name)(new_vals)
if change and was_changed:
self.fields_changed.append(f.verbose_name)
Please sign in to comment.
Something went wrong with that request. Please try again.