From 60a77788be13f00684e7643c9d206d88d82d48e2 Mon Sep 17 00:00:00 2001
From: Zain Memon <zain@inzain.net>
Date: Sat, 5 Dec 2009 18:13:01 +0000
Subject: [PATCH] [soc2009/admin-ui] Fix for a bug where saving m2m
 autocomplete fields was throwing an exception because there was a trailing
 comma. This also allows trailing commas on m2m raw_id_fields.

git-svn-id: http://code.djangoproject.com/svn/django/branches/soc2009/admin-ui@11796 bcc190cf-cafb-0310-a4f2-bffc1f526a37
---
 django/contrib/admin/templates/widget/m2m_searchinput.html | 3 ---
 django/contrib/admin/widgets.py                            | 6 +++++-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/django/contrib/admin/templates/widget/m2m_searchinput.html b/django/contrib/admin/templates/widget/m2m_searchinput.html
index 7f735328a1..145731a970 100644
--- a/django/contrib/admin/templates/widget/m2m_searchinput.html
+++ b/django/contrib/admin/templates/widget/m2m_searchinput.html
@@ -1,12 +1,9 @@
 {% load i18n %}
-
 <a href="{{ related_url }}{{ url }}" class="related-lookup" id="lookup_id_{{ name }}" onclick="return showRelatedObjectLookupPopup(this);">
   <img src="{{ admin_media_prefix }}img/admin/selector-search.gif" width="16" height="16" alt="{% trans "Lookup" %}" />
 </a>
 <script type="text/javascript">
 $(document).ready(function() {
-    // Show lookup input
-    
     $('#id_{{ name }}').tokenInput("{{ search_path }}", {
         noResultsText: "No results found.",
         searchingText: "Searching..."
diff --git a/django/contrib/admin/widgets.py b/django/contrib/admin/widgets.py
index 9c98880329..dc16215c9c 100644
--- a/django/contrib/admin/widgets.py
+++ b/django/contrib/admin/widgets.py
@@ -246,8 +246,12 @@ class ManyToManyRawIdWidget(ForeignKeyRawIdWidget):
 
     def value_from_datadict(self, data, files, name):
         value = data.get(name, None)
+        
+        if value and value[-1] == ',':
+            value = value[0:-1] # truncate trailing comma
+        
         if value and ',' in value:
-            return data[name].split(',')
+            return value.split(',')
         if value:
             return [value]
         return None