Mypy: removed type ignore at table_form()

openatlas/forms/form.py

@@ -51,12 +51,8 @@ class Form(FlaskForm):
     return Form()
 
 
-def get_table_form(
-        classes: list[str],
-        excluded: list[int] | list[Entity]) -> str:
+def get_table_form(classes: list[str], excluded: list[int]) -> str:
     entities = Entity.get_by_class(classes, types=True, aliases=True)
-    if excluded and isinstance(excluded[0], Entity):
-        excluded = [entity.id for entity in excluded]  # type: ignore
     table = Table([''] + g.table_headers[classes[0]], order=[[2, 'asc']])
     if (classes[0] == 'file' and
             (g.settings['image_processing'] or g.settings['iiif'])

openatlas/views/file.py

@@ -7,8 +7,8 @@
 from werkzeug.wrappers import Response
 
 from openatlas import app
-from openatlas.display.util import check_iiif_file_exist, \
-    convert_image_to_iiif, required_group
+from openatlas.display.util import (
+    check_iiif_file_exist, convert_image_to_iiif, required_group)
 from openatlas.forms.form import get_table_form
 from openatlas.models.entity import Entity
 
@@ -62,7 +62,7 @@ def file_add(id_: int, view: str) -> str | Response:
         'content.html',
         content=get_table_form(
             g.view_class_mapping[view],
-            entity.get_linked_entities('P67')),
+            [e.id for e in entity.get_linked_entities('P67')]),
         title=entity.name,
         crumbs=[
             [_(entity.class_.view), url_for('index', view=entity.class_.view)],

openatlas/views/link.py

@@ -57,7 +57,9 @@ def link_insert(id_: int, view: str) -> str | Response:
         excluded = entity.get_linked_entities(property_code, inverse=inverse)
     return render_template(
         'content.html',
-        content=get_table_form(g.view_class_mapping[view], excluded),
+        content=get_table_form(
+            g.view_class_mapping[view],
+            [e.id for e in excluded]),
         title=_(entity.class_.view),
         crumbs=[
             [_(entity.class_.view), url_for('index', view=entity.class_.view)],
@@ -232,7 +234,7 @@ def entity_add_file(id_: int) -> str | Response:
         'content.html',
         content=get_table_form(
             ['file'],
-            entity.get_linked_entities('P67', inverse=True)),
+            [e.id for e in entity.get_linked_entities('P67', inverse=True)]),
         entity=entity,
         title=entity.name,
         crumbs=[
@@ -256,7 +258,7 @@ def entity_add_source(id_: int) -> str | Response:
         'content.html',
         content=get_table_form(
             ['source'],
-            entity.get_linked_entities('P67', inverse=True)),
+            [e.id for e in entity.get_linked_entities('P67', inverse=True)]),
         title=entity.name,
         crumbs=[
             [_(entity.class_.view), url_for('index', view=entity.class_.view)],