Fix #2117 - Modification events not showing at artifact view

acdh-oeaw · Nov 13, 2023 · 8afd4c4 · 8afd4c4
1 parent a7b7ed6
commit 8afd4c4
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 7 deletions.
diff --git a/config/default.py b/config/default.py
@@ -3,7 +3,7 @@
 
 from config.database_versions import DATABASE_VERSIONS
 
-VERSION = '7.17.2'
+VERSION = '7.17.3'
 DATABASE_VERSION = DATABASE_VERSIONS[0]
 DEMO_MODE = False  # If activated some options are disabled, login is prefilled
 DEBUG = False

diff --git a/install/upgrade/upgrade.md b/install/upgrade/upgrade.md
@@ -18,7 +18,7 @@ then run the database upgrade script, then restart Apache:
     sudo python3 install/upgrade/database_upgrade.py
     sudo service apache2 restart
 
-### 7.17.x to 7.17.2
+### 7.17.x to 7.17.3
 A code base update (e.g. with git pull) and a webserver restart is sufficient.
 
 ### 7.16.x to 7.17.0

diff --git a/openatlas/display/base_display.py b/openatlas/display/base_display.py
@@ -377,7 +377,13 @@ def add_tabs(self) -> None:
 
         for link_ in entity.get_links(['P31', 'P67'], inverse=True):
             domain = link_.domain
+            if domain.class_.view == 'reference_system':
+                entity.reference_systems.append(link_)
+                continue
             data = get_base_table_data(domain)
+            if domain.class_.view in ['event']:
+                self.tabs[domain.class_.view].table.rows.append(data)
+                continue
             if domain.class_.view == 'file':
                 ext = data[3]
                 data.append(profile_image_table_link(entity, domain, ext))
@@ -403,15 +409,10 @@ def add_tabs(self) -> None:
                                     place_id=entity.id,
                                     link_id=link_.id))
                     data.append(content)
-            if domain.class_.view == 'event':
-                continue
             if domain.class_.view not in ['source', 'file']:
                 data.append(link_.description)
                 data.append(edit_link(
                     url_for('link_update', id_=link_.id, origin_id=entity.id)))
-                if domain.class_.view == 'reference_system':
-                    entity.reference_systems.append(link_)
-                    continue
             data.append(
                 remove_link(domain.name, link_, entity, domain.class_.view))
             self.tabs[domain.class_.view].table.rows.append(data)

diff --git a/openatlas/views/changelog.py b/openatlas/views/changelog.py
@@ -15,6 +15,9 @@ def index_changelog() -> str:
 
 
 versions = {
+    '7.17.3': ['2023-11-13', {
+        'fix': {
+            '2117': 'Modification events not showing at artifact view'}}],
     '7.17.2': ['2023-11-09', {
         'fix': {
             '2114': 'JavaSrcipt datatable error'}}],