Permalink
Browse files

magic-removal: Merged to [1976]

git-svn-id: http://code.djangoproject.com/svn/django/branches/magic-removal@1977 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
adrianholovaty committed Jan 15, 2006
1 parent 6e664fe commit 34c587e81e28dcd3cb0df1c98c25ac64ae17b4ff
Showing with 2 additions and 2 deletions.
  1. +1 −1 django/contrib/admin/templates/admin/base.html
  2. +1 −1 django/db/models/base.py
@@ -36,7 +36,7 @@
<!-- Content -->
<div id="content" class="{% block coltype %}colM{% endblock %}">
{% block pretitle %}{% endblock %}
{% if title %}<h1>{{ title }}</h1>{% endif %}
{% block content_title %}{% if title %}<h1>{{ title }}</h1>{% endif %}{% endblock %}
{% block content %}{{ content }}{% endblock %}
{% block sidebar %}{% endblock %}
<br class="clear" />
View
@@ -413,7 +413,7 @@ def _get_many_to_many_objects(self, field_with_rel):
return getattr(self, cache_var)
def _set_many_to_many_objects(self, id_list, field_with_rel):
current_ids = [obj.id for obj in self._get_many_to_many_objects(field_with_rel)]
current_ids = [getattr(obj, obj._meta.pk.attname) for obj in self._get_many_to_many_objects(field_with_rel)]
ids_to_add, ids_to_delete = dict([(i, 1) for i in id_list]), []
for current_id in current_ids:
if current_id in id_list:

0 comments on commit 34c587e

Please sign in to comment.