Fix for types not knowing their category (#1609)

config.py

@@ -3,7 +3,7 @@
 
 from openatlas import app
 
-VERSION = '6.6.1'
+VERSION = '6.6.2'
 DATABASE_VERSION = '6.6.0'
 DEMO_MODE = False  # If activated some options are disabled, login is pre filled
 IS_UNIT_TEST = False

install/upgrade/upgrade.md

@@ -13,6 +13,9 @@ is working.
 
     service apache2 restart
 
+### 6.6.1 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
 A code base update (e.g. with git pull) and an Apache restart is sufficient.
 

openatlas/models/entity.py

@@ -30,6 +30,7 @@ def __init__(self, data: Dict[str, Any]) -> None:
         self.id = data['id']
         self.standard_type = None
         self.nodes: Dict['Node', str] = {}
+        self.name = data['name']
 
         if 'nodes' in data and data['nodes']:
             for item in data['nodes']:
@@ -46,7 +47,6 @@ def __init__(self, data: Dict[str, Any]) -> None:
             self.aliases = {k: v for k, v in sorted(
                 self.aliases.items(),
                 key=lambda item_: item_[1])}
-        self.name = data['name']
         self.description = data['description']
         self.created = data['created']
         self.modified = data['modified']

openatlas/models/node.py

@@ -51,7 +51,7 @@ def populate_subs(nodes: Dict[int, Node]) -> None:
                     node,
                     node.root[0],
                     node.root)
-                node.category = nodes[node.root[-1]].category
+                node.category = hierarchies[node.root[-1]]['category']
             else:
                 node.category = hierarchies[node.id]['category']
                 node.multiple = hierarchies[node.id]['multiple']

openatlas/util/changelog.py

@@ -1,6 +1,9 @@
 class Changelog:
 
     versions = {
+        '6.6.2': ['2021-11-23', {
+            'fix': {
+                '1609': 'Problem with types'}}],
         '6.6.1': ['2021-11-20', {
             'fix': {
                 '1607': 'Error at profile for readonly users'}}],

tests/test_index.py

@@ -29,13 +29,11 @@ def test_index(self) -> None:
             assert b'first' in rv.data
 
             # Translations
-            rv = self.app.get(
-                url_for('set_locale', language='de'),
-                follow_redirects=True)
+            self.app.get(url_for('set_locale', language='de'))
+            rv = self.app.get('/')
             assert b'Quelle' in rv.data
-            rv = self.app.get(
-                url_for('set_locale', language='en'),
-                follow_redirects=True)
+            self.app.get(url_for('set_locale', language='en'))
+            rv = self.app.get('/')
             assert b'Source' in rv.data
 
             rv = self.app.get(