Merge pull request #1 from robthehall/master

I've fixed the admin file to filter using the actual default manager, rather than rely on the conventional "objects".
ecometrica · May 16, 2011 · a52f873 · a52f873
2 parents a6ee0eb + 3c30e4e
commit a52f873
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/multisite/admin.py b/multisite/admin.py
@@ -67,11 +67,11 @@ def handle_multisite_foreign_keys(self, db_field, request, **kwargs):
         if(not request.user.is_superuser):
             user_sites = request.user.get_profile().sites.all()
             if(hasattr(db_field.rel.to, "site")):
-                kwargs["queryset"] = db_field.rel.to.objects.filter(
+                kwargs["queryset"] = db_field.rel.to._default_manager.filter(
                             site__in = user_sites
                         )
             if(hasattr(db_field.rel.to, "sites")):
-                kwargs["queryset"] = db_field.rel.to.objects.filter(
+                kwargs["queryset"] = db_field.rel.to._default_manager.filter(
                             sites__in = user_sites
                         )
             if db_field.name == "site" or db_field.name == "sites":
@@ -81,7 +81,7 @@ def handle_multisite_foreign_keys(self, db_field, request, **kwargs):
                     qkwargs = {
                                 self.multisite_indirect_foreign_key_path[db_field.name]: user_sites
                             }
-                    kwargs["queryset"] = db_field.rel.to.objects.filter(
+                    kwargs["queryset"] = db_field.rel.to._default_manager.filter(
                                 **qkwargs
                             )
         return kwargs