Merge pull request #80 from arthur-schnitzler/main

fix for broken clean date method, closes #187
acdh-oeaw · Apr 29, 2024 · 9fc1d26 · 9fc1d26
2 parents df79426 + d5d82b7
commit 9fc1d26
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 9 deletions.
diff --git a/apis_core/apis_metainfo/models.py b/apis_core/apis_metainfo/models.py
@@ -179,18 +179,24 @@ def img_credit_label(self):
         return credit
 
     def clean_start_date_written(self):
-        clean_date = self.start_date_written
         if self.start_date_written:
-            if "<" in self.start_date_written:
-                clean_date = self.start_date_written.split("<")[0]
-        return clean_date.strip()
+            clean_date = self.start_date_written
+            if self.start_date_written:
+                if "<" in self.start_date_written:
+                    clean_date = self.start_date_written.split("<")[0]
+            return clean_date.strip()
+        else:
+            return ""
 
     def clean_end_date_written(self):
-        clean_date = self.end_date_written
         if self.end_date_written:
-            if "<" in self.end_date_written:
-                clean_date = self.end_date_written.split("<")[0]
-        return clean_date.strip()
+            clean_date = self.end_date_written
+            if self.end_date_written:
+                if "<" in self.end_date_written:
+                    clean_date = self.end_date_written.split("<")[0]
+            return clean_date.strip()
+        else:
+            return ""
 
     @classmethod
     def get_listview_url(self):

diff --git a/apis_core/apis_tei/templates/apis_tei/date.xml b/apis_core/apis_tei/templates/apis_tei/date.xml
@@ -1,4 +1,4 @@
-{% if object.start_date_written == object.end_date_written %}
+{% if object.start_date_written == object.end_date_written and object.start_date_written %}
 <date>{{ object.clean_start_date_written }}</date>
 {% elif object.start_date_written and object.end_date_written %}
 <date