From 2b0dcf11792c766e72f7cfb487d65dffd54a289d Mon Sep 17 00:00:00 2001
From: Birger Schacht <birger.schacht@oeaw.ac.at>
Date: Wed, 13 Nov 2024 12:24:12 +0100
Subject: [PATCH] fix(apis_entities): remove merge form from the entities edit
 view

Remove the merge form from the default entities edit view, given that
there is a more powerful merge view that should be used instead.

Closes: #1285
---
 .../apis_entities/abstractentity_form.html          | 13 -------------
 .../apis_entities/templatetags/apis_entities.py     |  7 -------
 2 files changed, 20 deletions(-)

diff --git a/apis_core/apis_entities/templates/apis_core/apis_entities/abstractentity_form.html b/apis_core/apis_entities/templates/apis_core/apis_entities/abstractentity_form.html
index 3f7c57565..56c919b13 100644
--- a/apis_core/apis_entities/templates/apis_core/apis_entities/abstractentity_form.html
+++ b/apis_core/apis_entities/templates/apis_core/apis_entities/abstractentity_form.html
@@ -1,6 +1,5 @@
 {% extends "apis_core/apis_entities/abstractentity.html" %}
 {% load crispy_forms_tags %}
-{% load apis_entities %}
 {% load static %}
 
 {% block col-zero %}
@@ -10,18 +9,6 @@
   </div>
 {% endblock col-zero %}
 
-{% block col-one %}
-  {{ block.super }}
-  <div class="card mt-2">
-    <div class="card-body">
-      {% mergeform as mergeform %}
-      {% if mergeform %}
-        {% crispy mergeform mergeform.helper %}
-      {% endif %}
-    </div>
-  </div>
-{% endblock col-one %}
-
 {% block scripts %}
   {{ block.super }}
   <script src="{% static "js/apis_entities.js" %}"></script>
diff --git a/apis_core/apis_entities/templatetags/apis_entities.py b/apis_core/apis_entities/templatetags/apis_entities.py
index eb88e04ee..d2df8aa4b 100644
--- a/apis_core/apis_entities/templatetags/apis_entities.py
+++ b/apis_core/apis_entities/templatetags/apis_entities.py
@@ -1,7 +1,6 @@
 from django import template
 from django.contrib.contenttypes.models import ContentType
 
-from apis_core.apis_entities.forms import EntitiesMergeForm
 from apis_core.apis_entities.models import AbstractEntity
 from apis_core.apis_entities.utils import get_entity_classes
 
@@ -48,9 +47,3 @@ def entities_verbose_name_plural_listview_url():
         for entity in get_entity_classes()
     }
     return sorted(ret.items())
-
-
-@register.simple_tag(takes_context=True)
-def mergeform(context):
-    obj = context["object"]
-    return EntitiesMergeForm(instance=obj)