Skip to content
Snippets Groups Projects
Commit 0afb5bba authored by dcz's avatar dcz
Browse files

Loading entries with lu optimization bugfix

parent 47ae4a11
Branches
No related merge requests found
......@@ -423,7 +423,7 @@ def get_entries(request):
assert(not errors_dict)
linked_ids = set()
if request.session['show_linked_entries'] and not with_lexical_units:
if request.session['show_linked_entries'] and has_unified_frame != 'true':
entries_linked = Entry.objects.filter(pk__in=(
Entry.objects
.filter(subentries__schema_hooks__argument_connections__schema_connections__subentry__entry__in=entries)
......@@ -481,7 +481,7 @@ def get_entries(request):
def iter_lexical_units(e):
for lu in e.lexical_units.all():
lu._frame = lu._frames[0] if lu._frames and len(lu._frames) > 0 else None
if lu._frame is None or not hasattr(lu._frame, 'slowal_frame_2_unified_frame'):
if lu._frame is None or (not hasattr(lu._frame, 'slowal_frame_2_unified_frame') and has_unified_frame == 'true'):
continue
else:
yield lu
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment