Fix broken quick creation form

PiRogueToolSuite · Oct 14, 2024 · 1a60923 · 1a60923
1 parent f7ecac6
commit 1a60923
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 11 deletions.
diff --git a/colander/core/datasets.py b/colander/core/datasets.py
@@ -43,16 +43,22 @@ def __creatable_entity_and_types():
     for name, model in colander_models.items():
         if hasattr(model, 'type') and name not in exclude:
             models.append({
-                'name': name
+                 'name': name,
+                 'short_name': name.upper()
             })
-            types[name] = [
-                {'label': t.name,
-                 'id': t.short_name, }
+            types[name.upper()] = [
+                {
+                    'label': t.name,
+                    'name': t.name,
+                    'id': t.short_name,
+                }
                 for t in model.type.get_queryset().all()
             ]
+            types[name] = types[name.upper()]
 
     model_data = {
         'models': models,
+        'super_types': models,
         'types': types
     }
 

diff --git a/colander/core/views/views.py b/colander/core/views/views.py
@@ -154,13 +154,14 @@ def quick_creation_view(request):
 
     search_results = False
     entities_list = []
+    model_data = datasets.creatable_entity_and_types
 
     if request.method == 'POST':
         if 'create_entity' in request.POST:
-            model_name = request.POST.get('model')
-            type_name = request.POST.get('type')
+            model_name = request.POST.get('super_type')  # OBSERVABLE
+            type_name = request.POST.get('type')  # DOMAIN
             names = request.POST.get('name')
-            model = colander_models.get(model_name)
+            model = {t.upper(): m for t, m in colander_models.items()}.get(model_name.upper())
             type_model = model.type.field.related_model
             type = type_model.objects.get(short_name=type_name)
             for name in names.splitlines():
@@ -175,9 +176,9 @@ def quick_creation_view(request):
                         pap=active_case.pap
                     )
                     entity.save()
-                    messages.add_message(request, messages.SUCCESS, f"The {model_name} named {name} of type {type} successfully created.")
+                    messages.add_message(request, messages.SUCCESS, f"The {model_name.title()} named {name} of type {type} successfully created.")
                 else:
-                    messages.add_message(request, messages.WARNING, f"The {model_name} named {name} of type {type} already exists.")
+                    messages.add_message(request, messages.WARNING, f"The {model_name.title()} named {name} of type {type} already exists.")
         else:
             query = request.POST.get('q', '')
             entities_list = do_search(query, [active_case])
@@ -186,8 +187,6 @@ def quick_creation_view(request):
     if not search_results:
         entities_list = active_case.get_all_entities(exclude_types=['Case', 'EntityRelation'])
 
-    model_data = datasets.creatable_entity_and_types
-
     ctx = {
         'active_case': active_case,
         'models': model_data,