Fix for error at CSV export (#1621)

acdh-oeaw · Dec 23, 2021 · 3096a21 · 3096a21
1 parent 47c6c2a
commit 3096a21
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 6 deletions.
diff --git a/config.py b/config.py
@@ -3,7 +3,7 @@
 
 from openatlas import app
 
-VERSION = '6.6.3'
+VERSION = '6.6.4'
 DATABASE_VERSION = '6.6.0'
 DEMO_MODE = False  # If activated some options are disabled, login is pre filled
 IS_UNIT_TEST = False

diff --git a/install/upgrade/upgrade.md b/install/upgrade/upgrade.md
@@ -13,10 +13,13 @@ is working.
 
     service apache2 restart
 
-### 6.6.2 to 6.6.3
+### 6.6.x to 6.6.4
 A code base update (e.g. with git pull) and an Apache restart is sufficient.
 
-### 6.6.1 to 6.6.2
+### 6.6.x to 6.6.3
+A code base update (e.g. with git pull) and an Apache restart is sufficient.
+
+### 6.6.x to 6.6.2
 A code base update (e.g. with git pull) and an Apache restart is sufficient.
 
 ### 6.6.0 to 6.6.1

diff --git a/openatlas/models/export.py b/openatlas/models/export.py
@@ -34,7 +34,7 @@ def csv_export(form: FlaskForm) -> None:
             'id',
             'name',
             'description',
-            'class_code',
+            'cidoc_class_code',
             "replace(to_char(begin_from, 'yyyy-mm-dd BC'), ' AD', '')",
             "replace(to_char(begin_to, 'yyyy-mm-dd BC'), ' AD', '')",
             'begin_comment',

diff --git a/openatlas/util/changelog.py b/openatlas/util/changelog.py
@@ -1,8 +1,10 @@
 class Changelog:
 
     versions = {
+        '6.6.4': ['2021-12-23', {
+            'fix': {'1621': 'Error at CSV export'}}],
         '6.6.3': ['2021-12-08', {
-            'fix': {'1616': 'Error at inserting an adminitrative unit'}}],
+            'fix': {'1616': 'Error at inserting an administrative unit'}}],
         '6.6.2': ['2021-11-23', {
             'fix': {'1609': 'Problem with types'}}],
         '6.6.1': ['2021-11-20', {

diff --git a/tests/test_export.py b/tests/test_export.py
@@ -57,7 +57,14 @@ def test_export(self) -> None:
                 follow_redirects=True,
                 data={
                     'zip': True,
-                    'model_class': True,
+                    'model_cidoc_class': True,
+                    'model_cidoc_class_inheritance': True,
+                    'model_entity': True,
+                    'model_link': True,
+                    'model_property': True,
+                    'model_property_inheritance': True,
+                    'gis_linestring': True,
+                    'gis_polygon': True,
                     'gis_point': True,
                     'gis_format': 'wkt'})
             assert b'Data was exported as CSV' in rv.data