New forms: update

Author: AlexanderWatzinger

openatlas/forms/entity_form.py

@@ -32,7 +32,7 @@ class Form(FlaskForm):
     add_buttons(Form, entity)
     form: Any = Form(obj=entity)
     if request.method == 'GET' and entity.id:
-        populate_update(form, entity)
+        populate_update(entity, form)
     # elif request.method == 'GET' and entity.id:
     #    populate_insert(form, entity, origin, date)
     return form
@@ -187,13 +187,28 @@ def process_form_data(entity: Entity, form: Any) -> Entity:
             value = getattr(form, attr).data
             data[attr] = value.strip() if isinstance(value, str) else value
     if entity.id:
-        update_entity(entity, form, data)
+        delete_links(entity)
+        entity.update(data)
     else:
         entity = insert_entity(form, data)
+    process_types(entity, form)
     process_relations(entity, form)
     return entity
 
 
+def process_types(entity: Entity, form: Any) -> None:
+    for type_ in [g.types[id_] for id_ in entity.class_.hierarchies]:
+        if data := convert(getattr(form, str(type_.id)).data):
+            # if entity.class_.name in \ # Todo: check still needed?
+            #         ['actor_function', 'actor_relation', 'involvement']:
+            #    continue
+            if type_.class_.name == 'administrative_unit':
+                pass
+                # manager.data['administrative_units'] += value
+            else:  # if entity.class_.view != 'type': # Todo: check needed?
+                entity.link('P2', [g.types[id_] for id_ in data])
+
+
 def process_relations(entity: Entity, form: Any) -> None:
     for name, relation in entity.class_.relations.items():
         if relation['mode'] == 'tab':
@@ -217,25 +232,40 @@ def insert_entity(form: Any, data: dict[str, Any]) -> Entity:
     return entity
 
 
-def update_entity(entity: Entity, form: Any, data: dict[str, Any]) -> None:
-    delete_links: dict[str, Any] = {'property': [], 'property_inverse': []}
-    for i in entity.class_.relations.values():
-        if i['mode'] != 'tab':
-            if i['inverse']:
-                delete_links['property_inverse'].append(i['property'])
+def delete_links(entity: Entity) -> None:
+    links: dict[str, Any] = {'property': [], 'property_inverse': []}
+    if entity.class_.hierarchies:
+        links['property'].append('P2')  # Todo: what about place types?
+    for item in entity.class_.relations.values():
+        if item['mode'] != 'tab':
+            if item['inverse']:
+                links['property_inverse'].append(item['property'])
             else:
-                delete_links['property'].append(i['property'])
-    if delete_links['property_inverse']:
-        entity.delete_links(delete_links['property_inverse'], True)
-    if delete_links['property']:
-        entity.delete_links(delete_links['property'])
-    if entity.class_.name in ['place', 'type']:
-        new_super = g.types[entity.root[0]]
-        if data1 := getattr(form, new_super.name).data:
-            new_super = g.types[int(convert(data1)[0])]
-        entity.link('has super', new_super.id)
-    entity.update(data)
-
-
-def populate_update(form: Any, entity: Entity) -> None:
-    form.opened.data = time.time()
+                links['property'].append(item['property'])
+    if links['property_inverse']:
+        entity.delete_links(links['property_inverse'], True)
+    if links['property']:
+        entity.delete_links(links['property'])
+
+
+def populate_update(entity: Entity, form: Any) -> None:
+    form.opened.data = time.time()  # Todo: what if POST because of not valid?
+    # Todo: deal with link types
+    # types: dict[Any, Any] = manager.link_.types \
+    #    if manager.link_ else manager.entity.types
+    # Todo: deal with place types
+    # if manager.entity and manager.entity.class_.name == 'place':
+    #     if location := \
+    #             manager.entity.get_linked_entity_safe('P53', types=True):
+    #        types |= location.types  # Admin. units and historical places
+    type_data: dict[int, list[int]] = {}
+    for type_, value in entity.types.items():
+        root = g.types[type_.root[0]] if type_.root else type
+        if root.id not in type_data:
+            type_data[root.id] = []
+        type_data[root.id].append(type_.id)
+        if root.category == 'value':
+            getattr(form, str(type_.id)).data = value
+    for root_id, types_ in type_data.items():
+        if hasattr(form, str(root_id)):
+            getattr(form, str(root_id)).data = types_

openatlas/forms/manager_base.py

@@ -12,7 +12,7 @@
 from openatlas.forms.add_fields import add_date_fields, add_reference_systems
 from openatlas.forms.field import TableField, TreeField
 from openatlas.forms.populate import (
-    populate_dates, populate_reference_systems, populate_types)
+    populate_dates, populate_reference_systems)
 from openatlas.forms.process import (
     process_dates, process_origin, process_standard_fields)
 from openatlas.forms.util import check_if_entity_has_time, convert
@@ -105,7 +105,6 @@ def populate_insert(self) -> None:
     def populate_update(self) -> None:
         if self.entity and not self.copy:
             self.form.entity_id.data = self.entity.id
-        populate_types(self)
         populate_reference_systems(self)
         if 'date' in self.fields:
             populate_dates(self)

openatlas/forms/populate.py

@@ -5,26 +5,6 @@
 from openatlas.display.util2 import format_date_part
 
 
-def populate_types(manager: Any) -> None:
-    types: dict[Any, Any] = manager.link_.types \
-        if manager.link_ else manager.entity.types
-    if manager.entity and manager.entity.class_.name == 'place':
-        if location := \
-                manager.entity.get_linked_entity_safe('P53', types=True):
-            types |= location.types  # Admin. units and historical places
-    type_data: dict[int, list[int]] = {}
-    for type_, value in types.items():
-        root = g.types[type_.root[0]] if type_.root else type
-        if root.id not in type_data:
-            type_data[root.id] = []
-        type_data[root.id].append(type_.id)
-        if root.category == 'value':
-            getattr(manager.form, str(type_.id)).data = value
-    for root_id, types_ in type_data.items():
-        if hasattr(manager.form, str(root_id)):
-            getattr(manager.form, str(root_id)).data = types_
-
-
 def populate_reference_systems(manager: Any) -> None:
     if not manager.entity:
         return  # It's a link update which have no reference systems

openatlas/forms/process.py

@@ -66,20 +66,6 @@ def process_standard_fields(manager: Any) -> None:
             manager.data['attributes']['name'] = name
         elif key == 'alias':
             manager.data['aliases'] = value
-        elif field_type in ['TreeField', 'TreeMultiField']:
-
-            if manager.class_.name in \
-                    ['actor_function', 'actor_relation', 'involvement']:
-                continue
-            if g.types[int(getattr(manager.form, key).id)].class_.name \
-                    == 'administrative_unit':
-                if 'administrative_units' not in manager.data:
-                    manager.data['administrative_units'] = []
-                manager.data['administrative_units'] += value
-            elif not manager.entity or manager.entity.class_.view != 'type':
-                manager.data['links']['delete'].add('P2')
-                manager.add_link('P2', [g.types[id_] for id_ in value])
-
         elif field_type == 'ValueTypeField':
             if value is not None:  # Allow the number zero
                 manager.add_link('P2', g.types[int(key)], value)