Django 1.11: fix get_model_fields

2 files changed, 1 insertions, 12 deletions

diff --git a/archaeological_finds/models_finds.py b/archaeological_finds/models_finds.py
index b3a167a26..8a7dbaf08 100644
--- a/archaeological_finds/models_finds.py
+++ b/archaeological_finds/models_finds.py
@@ -327,14 +327,6 @@ class BaseFind(BulkUpdatedItem, BaseHistorizedItem, OwnPerms):
     def name(self):
         return self.label
 
-    @classmethod
-    def get_extra_fields(cls):
-        fields = {}
-        for field in Find._meta.many_to_many:
-            if field.name == 'base_finds':
-                fields['find'] = field.related.model
-        return fields
-
     def save(self, *args, **kwargs):
         returned = super(BaseFind, self).save(*args, **kwargs)
 
diff --git a/ishtar_common/models_imports.py b/ishtar_common/models_imports.py
index 3c62bb53d..f455cc968 100644
--- a/ishtar_common/models_imports.py
+++ b/ishtar_common/models_imports.py
@@ -59,11 +59,8 @@ def get_model_fields(model):
     To be replace in Django 1.8 with get_fields, get_field
     """
     fields = {}
-    options = model._meta
-    for field in sorted(options.fields + options.many_to_many):
+    for field in model._meta.get_fields():
         fields[field.name] = field
-    if hasattr(model, 'get_extra_fields'):
-        fields.update(model.get_extra_fields())
     return fields