From 920e7efd7fdaf83367c86959b7d68872b2efb64b Mon Sep 17 00:00:00 2001
From: krateng <git.noreply@krateng.ch>
Date: Tue, 17 Oct 2023 22:09:39 +0200
Subject: [PATCH] Inline edit functionality now also for merging

---
 maloja/web/jinja/partials/charts_albums.jinja  | 2 +-
 maloja/web/jinja/partials/charts_artists.jinja | 2 +-
 maloja/web/jinja/partials/charts_tracks.jinja  | 2 +-
 maloja/web/jinja/snippets/entityrow.jinja      | 2 ++
 4 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/maloja/web/jinja/partials/charts_albums.jinja b/maloja/web/jinja/partials/charts_albums.jinja
index 7b2caf2..f5cd7e6 100644
--- a/maloja/web/jinja/partials/charts_albums.jinja
+++ b/maloja/web/jinja/partials/charts_albums.jinja
@@ -33,7 +33,7 @@
 <table class='list'>
 	{% for e in charts %}
 		{% if loop.index0 >= firstindex and loop.index0 < lastindex %}
-		<tr class="listrow associateicons" data-entity_id="{{ e['album_id'] }}" data-entity_type="album" data-entity_name="{{ e['album'].albumtitle }}">
+		<tr class="listrow associateicons mergeicons" data-entity_id="{{ e['album_id'] }}" data-entity_type="album" data-entity_name="{{ e['album'].albumtitle }}">
 			<!-- Rank -->
 			<td class="rank">{%if loop.changed(e.scrobbles) %}#{{ e.rank }}{% endif %}</td>
 			<!-- Rank change -->
diff --git a/maloja/web/jinja/partials/charts_artists.jinja b/maloja/web/jinja/partials/charts_artists.jinja
index 19413f9..6f52fa4 100644
--- a/maloja/web/jinja/partials/charts_artists.jinja
+++ b/maloja/web/jinja/partials/charts_artists.jinja
@@ -36,7 +36,7 @@
 <table class='list'>
 	{% for e in charts %}
 		{% if loop.index0 >= firstindex and loop.index0 < lastindex %}
-		<tr class="listrow associateicons" data-entity_id="{{ e['artist_id'] }}" data-entity_type="artist" data-entity_name="{{ e['artist'] }}">
+		<tr class="listrow associateicons mergeicons" data-entity_id="{{ e['artist_id'] }}" data-entity_type="artist" data-entity_name="{{ e['artist'] }}">
 			<!-- Rank -->
 			<td class="rank">{%if loop.changed(e.scrobbles) %}#{{ e.rank }}{% endif %}</td>
 			<!-- Rank change -->
diff --git a/maloja/web/jinja/partials/charts_tracks.jinja b/maloja/web/jinja/partials/charts_tracks.jinja
index 5bd2c09..293a2eb 100644
--- a/maloja/web/jinja/partials/charts_tracks.jinja
+++ b/maloja/web/jinja/partials/charts_tracks.jinja
@@ -33,7 +33,7 @@
 <table class='list'>
 	{% for e in charts %}
 		{% 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 }}">
 			<!-- Rank -->
 			<td class="rank">{%if loop.changed(e.scrobbles) %}#{{ e.rank }}{% endif %}</td>
 			<!-- Rank change -->
diff --git a/maloja/web/jinja/snippets/entityrow.jinja b/maloja/web/jinja/snippets/entityrow.jinja
index 843fe20..bb6e2b1 100644
--- a/maloja/web/jinja/snippets/entityrow.jinja
+++ b/maloja/web/jinja/snippets/entityrow.jinja
@@ -37,6 +37,8 @@
 
 {% if adminmode and (entity is mapping)  %}
 <td>
+{% include 'icons/merge_mark.jinja' %}
+{% include 'icons/merge_unmark.jinja' %}
 {% include 'icons/association_mark.jinja' %}
 {% include 'icons/association_unmark.jinja' %}
 </td>