diff --git a/maloja/apis/native_v1.py b/maloja/apis/native_v1.py
index ac3af69..f221c89 100644
--- a/maloja/apis/native_v1.py
+++ b/maloja/apis/native_v1.py
@@ -53,7 +53,7 @@ errors = {
"error":{
'type':'entity_exists',
'value':e.entitydict,
- 'desc':"This entity already exists in the database."
+ 'desc':"This entity already exists in the database. Consider merging instead."
}
}),
Exception: lambda e: (500,{
diff --git a/maloja/database/sqldb.py b/maloja/database/sqldb.py
index 170a701..e463749 100644
--- a/maloja/database/sqldb.py
+++ b/maloja/database/sqldb.py
@@ -446,6 +446,7 @@ def merge_tracks(target_id,source_ids,dbconn=None):
@connection_provider
def merge_artists(target_id,source_ids,dbconn=None):
+ # todo: songs that have both artists!
op = DB['trackartists'].update().where(
DB['trackartists'].c.artist_id.in_(source_ids)
diff --git a/maloja/web/jinja/icons/delete.jinja b/maloja/web/jinja/icons/delete.jinja
index fb2e35e..c1498ed 100644
--- a/maloja/web/jinja/icons/delete.jinja
+++ b/maloja/web/jinja/icons/delete.jinja
@@ -1,4 +1,6 @@
-
+
diff --git a/maloja/web/jinja/icons/reparse.jinja b/maloja/web/jinja/icons/reparse.jinja
index fe60776..2f13d39 100644
--- a/maloja/web/jinja/icons/reparse.jinja
+++ b/maloja/web/jinja/icons/reparse.jinja
@@ -1,3 +1,5 @@
-
+
diff --git a/maloja/web/jinja/icons/settings.jinja b/maloja/web/jinja/icons/settings.jinja
index 62434cc..f110b5c 100644
--- a/maloja/web/jinja/icons/settings.jinja
+++ b/maloja/web/jinja/icons/settings.jinja
@@ -1,7 +1,10 @@
-
+
diff --git a/maloja/web/jinja/partials/scrobbles.jinja b/maloja/web/jinja/partials/scrobbles.jinja
index 42a4c11..dc487c3 100644
--- a/maloja/web/jinja/partials/scrobbles.jinja
+++ b/maloja/web/jinja/partials/scrobbles.jinja
@@ -25,9 +25,7 @@
-
- {% include 'icons/reparse.jinja' %}
-
+ {% include 'icons/reparse.jinja' %}
@@ -39,9 +37,7 @@
-
- {% include 'icons/delete.jinja' %}
-
+ {% include 'icons/delete.jinja' %}
diff --git a/maloja/web/static/js/edit.js b/maloja/web/static/js/edit.js
index 08e2d1f..d0119b3 100644
--- a/maloja/web/static/js/edit.js
+++ b/maloja/web/static/js/edit.js
@@ -163,7 +163,7 @@ function markForMerge() {
current_stored.push(entity_id);
current_stored = [...new Set(current_stored)];
lcst.setItem(key,current_stored); //this already formats it correctly
- notify("Success","Marked " + entity_name + " for merge, currently " + current_stored.length + " marked!")
+ notify("Marked " + entity_name + " for merge","Currently " + current_stored.length + " marked!")
showValidMergeIcons();
}
@@ -201,4 +201,5 @@ function cancelMerge() {
var key = "marked_for_merge_" + entity_type;
lcst.setItem(key,[]);
showValidMergeIcons();
+ notify("Cancelled merge!","")
}