Merge branch 'master' of github.com:django-mptt/django-mptt

samluescher · Mar 5, 2011 · fb375d8 · fb375d8
2 parents 74eb759 + 3fbf4ec
commit fb375d8
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/mptt/admin.py b/mptt/admin.py
@@ -38,8 +38,11 @@ class MPTTModelAdmin(ModelAdmin):
     def formfield_for_foreignkey(self, db_field, request, **kwargs):
         from mptt.models import MPTTModel
         if issubclass(db_field.rel.to, MPTTModel):
-            return TreeNodeChoiceField(queryset=db_field.rel.to.objects.all())
-        return super(MyModelAdmin, self).formfield_for_foreignkey(db_field, request, **kwargs)
+            return TreeNodeChoiceField(queryset=db_field.rel.to.objects.all(),
+                                       required=False)
+        return super(MPTTModelAdmin, self).formfield_for_foreignkey(db_field,
+                                                                    request,
+                                                                    **kwargs)
 
     def get_changelist(self, request, **kwargs):
         """