fix #115 #116 修复无限递归问题

newpanjing · Jul 22, 2019 · cdb94c3 · cdb94c3
1 parent 86cd162
commit cdb94c3
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1 +1,3 @@
 .idea/
+django_simpleui.egg-info
+dist
diff --git a/simpleui/templatetags/simpletags.py b/simpleui/templatetags/simpletags.py
@@ -381,8 +381,6 @@ def get_model_fields(model, base=None):
             list.append(('{}__{}'.format(base, f.name), label))
         else:
             list.append((f.name, label))
-        if isinstance(f, ForeignKey):
-            list.extend(get_model_fields(f.related_model, f.name))
 
     return list
 
@@ -391,8 +389,13 @@ def get_model_fields(model, base=None):
 def search_placeholder(context):
     cl = context.get('cl')
 
+    # 取消递归，只获取2级
     fields = get_model_fields(cl.model)
 
+    for f in cl.model._meta.fields:
+        if isinstance(f, ForeignKey):
+            fields.extend(get_model_fields(f.related_model, f.name))
+
     verboses = []
 
     for s in cl.search_fields: