-
- ${tr:Lms.Admin.Users.del-user-name}
-
diff --git a/approot/messages.xml b/approot/messages.xml
index 4b9b2f9e..8b4557e9 100644
--- a/approot/messages.xml
+++ b/approot/messages.xml
@@ -87,8 +87,7 @@
New user
Admin
-
Delete user
-
Delete user?
+
Delete user?
Demo
Users
@@ -156,6 +155,9 @@
Copyright
Disc {1}
+
+
Delete playlist?
+
Search...
diff --git a/approot/messages_fr.xml b/approot/messages_fr.xml
index 87dae2f4..e3423213 100644
--- a/approot/messages_fr.xml
+++ b/approot/messages_fr.xml
@@ -87,8 +87,7 @@
Ajouter
Admin
-
Supprimer l'utilisateur
-
Supprimer l'utilisateur ?
+
Supprimer l'utilisateur ?
Demo
Utilisateurs
@@ -156,6 +155,9 @@
Copyright
Disque {1}
+
+
Supprimer la liste de lecture ?
+
Rechercher...
diff --git a/approot/messages_it.xml b/approot/messages_it.xml
index ecaf084f..a7574885 100644
--- a/approot/messages_it.xml
+++ b/approot/messages_it.xml
@@ -86,8 +86,7 @@
Nuovo utente
Amministratore
-
Elimina l'utente
-
Vuoi eliminare l'utente?
+
Elimina l'utente ?
Demo
Utenti
@@ -155,6 +154,8 @@
Copyright
Disco {1}
+
+
Ricerca...
diff --git a/approot/messages_zh.xml b/approot/messages_zh.xml
index 5e696bb4..9246e707 100644
--- a/approot/messages_zh.xml
+++ b/approot/messages_zh.xml
@@ -87,8 +87,7 @@
新建用户
管理员
-
删除用户
-
确认要删除此用户?
+
演示
用户
@@ -156,6 +155,8 @@
版权所有
唱片 {1}
+
+
搜索中...
diff --git a/approot/tracklists.xml b/approot/tracklists.xml
index fcf11a86..86560654 100644
--- a/approot/tracklists.xml
+++ b/approot/tracklists.xml
@@ -34,4 +34,20 @@
${loading-indicator}
+
+
+
+
diff --git a/src/lms/ui/admin/UsersView.cpp b/src/lms/ui/admin/UsersView.cpp
index 409b7bbc..10117e02 100644
--- a/src/lms/ui/admin/UsersView.cpp
+++ b/src/lms/ui/admin/UsersView.cpp
@@ -111,11 +111,13 @@ UsersView::refreshView()
auto* delBtn {modal->bindNew
("del-btn", Wt::WString::tr("Lms.delete"))};
delBtn->clicked().connect([=]
{
- auto transaction {LmsApp->getDbSession().createUniqueTransaction()};
+ {
+ auto transaction {LmsApp->getDbSession().createUniqueTransaction()};
- User::pointer user {User::find(LmsApp->getDbSession(), userId)};
- if (user)
- user.remove();
+ User::pointer user {User::find(LmsApp->getDbSession(), userId)};
+ if (user)
+ user.remove();
+ }
_container->removeWidget(entry);
diff --git a/src/lms/ui/explore/TrackListsView.cpp b/src/lms/ui/explore/TrackListsView.cpp
index 207bfcc8..90623558 100644
--- a/src/lms/ui/explore/TrackListsView.cpp
+++ b/src/lms/ui/explore/TrackListsView.cpp
@@ -30,6 +30,7 @@
#include "ReleaseListHelpers.hpp"
#include "Filters.hpp"
#include "LmsApplication.hpp"
+#include "ModalManager.hpp"
#include "Utils.hpp"
using namespace Database;
@@ -125,7 +126,33 @@ namespace UserInterface
entry->bindNew("delete", Wt::WString::tr("Lms.delete"))
->clicked().connect([=]
{
- // TODO
+ auto modal {std::make_unique(Wt::WString::tr("Lms.Explore.TrackLists.template.delete-tracklist"))};
+ modal->addFunction("tr", &Wt::WTemplate::Functions::tr);
+ Wt::WWidget* modalPtr {modal.get()};
+
+ auto* delBtn {modal->bindNew("del-btn", Wt::WString::tr("Lms.delete"))};
+ delBtn->clicked().connect([=]
+ {
+ {
+ auto transaction {LmsApp->getDbSession().createUniqueTransaction()};
+
+ TrackList::pointer trackList {TrackList::find(LmsApp->getDbSession(), trackListId)};
+ if (trackList)
+ trackList.remove();
+ }
+
+ _container->remove(*entry);
+
+ LmsApp->getModalManager().dispose(modalPtr);
+ });
+
+ auto* cancelBtn {modal->bindNew("cancel-btn", Wt::WString::tr("Lms.cancel"))};
+ cancelBtn->clicked().connect([=]
+ {
+ LmsApp->getModalManager().dispose(modalPtr);
+ });
+
+ LmsApp->getModalManager().show(std::move(modal));
});
}