[Python-modules-commits] [python-social-auth] 89/131: Removed dep method get_all_field_name method from Django 1.8+

Wolfgang Borgert debacle at moszumanska.debian.org
Sat Dec 24 15:17:06 UTC 2016


This is an automated email from the git hooks/post-receive script.

debacle pushed a commit to tag v0.2.20
in repository python-social-auth.

commit 65b68d5e47f6990625c19afe8317397bdbbb11cd
Author: Zuhaib M Siddique <zuhaib at hipchat.com>
Date:   Tue Jul 26 16:37:04 2016 -0700

    Removed dep method get_all_field_name method from Django 1.8+
---
 social/apps/django_app/default/admin.py | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/social/apps/django_app/default/admin.py b/social/apps/django_app/default/admin.py
index de7802b..cf17b77 100644
--- a/social/apps/django_app/default/admin.py
+++ b/social/apps/django_app/default/admin.py
@@ -24,11 +24,23 @@ class UserSocialAuthOption(admin.ModelAdmin):
                        hasattr(_User, 'username') and 'username' or \
                        None
             fieldnames = ('first_name', 'last_name', 'email', username)
-            all_names = _User._meta.get_all_field_names()
+            all_names = self._get_all_field_names(_User._meta)
             search_fields = [name for name in fieldnames
                                 if name and name in all_names]
         return ['user__' + name for name in search_fields]
 
+    @staticmethod
+    def _get_all_field_names(model):
+        from itertools import chain
+
+        return list(set(chain.from_iterable(
+            (field.name, field.attname) if hasattr(field, 'attname') else (field.name,)
+            for field in model.get_fields()
+            # For complete backwards compatibility, you may want to exclude
+            # GenericForeignKey from the results.
+            if not (field.many_to_one and field.related_model is None)
+        )))
+
 
 class NonceOption(admin.ModelAdmin):
     """Nonce options"""

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/python-social-auth.git



More information about the Python-modules-commits mailing list