Merge branch 'develop' into feature/api_refactor

craws · Dec 10, 2024 · ea82fc9 · ea82fc9
2 parents 0a6ee16 + 695b416
commit ea82fc9
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/openatlas/models/tools.py b/openatlas/models/tools.py
@@ -244,6 +244,7 @@ def save(
             entity: Entity,
             data: dict[str, str],
             types: list[dict[str, Any]]) -> None:
+        from openatlas.models.entity import Link
         for dict_ in types:
             Link.delete_(dict_['link_id'])
         SexEstimation.prepare_feature_types()

diff --git a/openatlas/templates/tabs.html b/openatlas/templates/tabs.html
@@ -7,7 +7,7 @@
           <li class="nav-item" role="presentation">
             <a
                 class="fw-normal py-1 nav-link {% if loop.first %}active{% endif %}"
-                data-bs-toggle="tooltip"
+                data-bs-toggle="tab"
                 data-bs-placement="top"
                 title="{{ tab.tooltip }}"
                 role="tab"

diff --git a/tests/test_place.py b/tests/test_place.py
@@ -295,13 +295,13 @@ def test_place(self) -> None:
             url_for('sex_update', id_=strati_id),
             data={'Glabella': 'Female'},
             follow_redirects=True)
-        assert b'-2.0' in rv.data
+        assert b'Female' in rv.data
 
         rv = c.post(
             url_for('sex_update', id_=strati_id),
-            data={'Glabella': 'Female'},
+            data={'Glabella': 'Female?'},
             follow_redirects=True)
-        assert b'-2.0' in rv.data
+        assert b'Female?' in rv.data
 
         rv = c.get(url_for('sex_update', id_=strati_id))
         assert b'Glabella' in rv.data