From acf74020959b7619303f96c41e0aa94182481bfd Mon Sep 17 00:00:00 2001
From: krateng <git.noreply@krateng.ch>
Date: Wed, 18 Oct 2023 09:27:30 +0200
Subject: [PATCH] More fixes for inline editing

---
 maloja/web/jinja/partials/list_tracks.jinja | 2 +-
 maloja/web/jinja/snippets/entityrow.jinja   | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/maloja/web/jinja/partials/list_tracks.jinja b/maloja/web/jinja/partials/list_tracks.jinja
index 2ac3ef1..27353ce 100644
--- a/maloja/web/jinja/partials/list_tracks.jinja
+++ b/maloja/web/jinja/partials/list_tracks.jinja
@@ -10,7 +10,7 @@
 <table class='list'>
 	{% for e in list %}
 		{% if loop.index0 >= firstindex and loop.index0 < lastindex %}
-		<tr class="listrow associateicons" data-entity_id="{{ e['track_id'] }}" data-entity_type="track" data-entity_name="{{ e['track'].title }}">
+		<tr class="listrow associateicons mergeicons" data-entity_id="{{ e['track_id'] }}" data-entity_type="track" data-entity_name="{{ e['track'].title }}">
 
 			<!-- artist -->
 			{{ entityrow.row(e['track'],adminmode=adminmode) }}
diff --git a/maloja/web/jinja/snippets/entityrow.jinja b/maloja/web/jinja/snippets/entityrow.jinja
index bb6e2b1..e7a1074 100644
--- a/maloja/web/jinja/snippets/entityrow.jinja
+++ b/maloja/web/jinja/snippets/entityrow.jinja
@@ -35,12 +35,15 @@
 
 {% endif %}
 
-{% if adminmode and (entity is mapping)  %}
+
+{% if adminmode %}
 <td>
 {% include 'icons/merge_mark.jinja' %}
 {% include 'icons/merge_unmark.jinja' %}
+{% if (entity is mapping)  %}
 {% include 'icons/association_mark.jinja' %}
 {% include 'icons/association_unmark.jinja' %}
+{% endif %}
 </td>
 {% endif %}