Merge branch 'acdh-oeaw:main' into main

acdh-oeaw · Jan 24, 2024 · fbbaef6 · fbbaef6
2 parents 49651b6 + 8c76007
commit fbbaef6
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 11 deletions.
diff --git a/apis_core/api_renderers.py b/apis_core/api_renderers.py
@@ -23,9 +23,9 @@ def render(self, data, media_type=None, renderer_context=None):
                     rel2 = re.match("^{}[a-z]*".format(r2), rel)
                     if rel2:
                         source = r
-                    elif r.endswith("A"):
+                    elif r.endswith("a"):
                         source = r
-                    elif r.endswith("B"):
+                    elif r.endswith("b"):
                         target = r
                     rel2 = re.match("^[a-z]*?{}$".format(r2), rel)
                     if rel2:

diff --git a/apis_core/apis_entities/templates/apis_entities/detail_views/entity_detail_generic.html b/apis_core/apis_entities/templates/apis_entities/detail_views/entity_detail_generic.html
@@ -162,10 +162,9 @@ <h4 class="text-left">
                         </th>
                         <td>
                             {% for x in object.collection.all %}
-                                <li>
-                                    {{ x }}
-                                </li>
+                                {{ x }}<br />
                             {% endfor %}
+
                         </td>
                     </tr>
                     {% endif %}

diff --git a/apis_core/apis_entities/tests.py b/apis_core/apis_entities/tests.py
@@ -290,12 +290,8 @@ def test_020_api_list_view(self):
             r = client.get(value)
             self.assertTrue(r.status_code, 200)
             if key.startswith("relation"):
-                try:
-                    r = client.get(f"{value}?format=json%2Bnet")
-                    self.assertTrue(r.status_code, 200)
-                except Exception as e:
-                    print(value, e)
-                    continue
+                r = client.get(f"{value}?format=json%2Bnet")
+                self.assertTrue(r.status_code, 200)
 
     def test_021_api_detail_view(self):
         item = Person.objects.last()