owen/lms
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Can now delete a tracklist

Browse Source
This commit is contained in:
emeric
2022-06-26 20:02:14 +02:00
parent 1d233e39af
commit b4e8f55d15
8 changed files with 65 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
approot/admin-users.xml
+1 -4
View File
@@ -28,12 +28,9 @@
<div class="modal-dialog"> <div class="modal-dialog">
<div class="modal-content"> <div class="modal-content">
<div class="modal-header"> <div class="modal-header">
<h5 class="modal-title">${tr:Lms.Admin.Users.del-user}</h5> <h5 class="modal-title">${tr:Lms.Admin.Users.del-user-confirm}</h5>
<button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button> <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
</div> </div>
<div class="modal-body">
${tr:Lms.Admin.Users.del-user-name}
</div>
<div class="modal-footer"> <div class="modal-footer">
${del-btn class="btn btn-danger me-1"}${cancel-btn class="btn btn-secondary"} ${del-btn class="btn btn-danger me-1"}${cancel-btn class="btn btn-secondary"}
</div> </div>
approot/messages.xml
+4 -2
View File
@@ -87,8 +87,7 @@
<!--Users--> <!--Users-->
<message id="Lms.Admin.Users.add">New user</message> <message id="Lms.Admin.Users.add">New user</message>
<message id="Lms.Admin.Users.admin">Admin</message> <message id="Lms.Admin.Users.admin">Admin</message>
<message id="Lms.Admin.Users.del-user">Delete user</message> <message id="Lms.Admin.Users.del-user-confirm">Delete user?</message>
<message id="Lms.Admin.Users.del-user-name">Delete user?</message>
<message id="Lms.Admin.Users.demo">Demo</message> <message id="Lms.Admin.Users.demo">Demo</message>
<message id="Lms.Admin.Users.users">Users</message> <message id="Lms.Admin.Users.users">Users</message>
<message id="Lms.Admin.Users.menu-users"><i class="fa fa-fw fa-users" aria-hidden="true"></i> Users</message> <message id="Lms.Admin.Users.menu-users"><i class="fa fa-fw fa-users" aria-hidden="true"></i> Users</message>
@@ -156,6 +155,9 @@
<message id="Lms.Explore.Release.copyright">Copyright</message> <message id="Lms.Explore.Release.copyright">Copyright</message>
<message id="Lms.Explore.Release.disc">Disc {1}</message> <message id="Lms.Explore.Release.disc">Disc {1}</message>
<!--Explore:TrackLists-->
<message id="Lms.Explore.TrackLists.del-tracklist-confirm">Delete playlist?</message>
<!--Explore:Search--> <!--Explore:Search-->
<message id="Lms.Explore.Search.search-placeholder">Search...</message> <message id="Lms.Explore.Search.search-placeholder">Search...</message>
approot/messages_fr.xml
+4 -2
View File
@@ -87,8 +87,7 @@
<!--Users--> <!--Users-->
<message id="Lms.Admin.Users.add">Ajouter</message> <message id="Lms.Admin.Users.add">Ajouter</message>
<message id="Lms.Admin.Users.admin">Admin</message> <message id="Lms.Admin.Users.admin">Admin</message>
<message id="Lms.Admin.Users.del-user">Supprimer l'utilisateur</message> <message id="Lms.Admin.Users.del-user-confirm">Supprimer l'utilisateur ?</message>
<message id="Lms.Admin.Users.del-user-name">Supprimer l'utilisateur ?</message>
<message id="Lms.Admin.Users.demo">Demo</message> <message id="Lms.Admin.Users.demo">Demo</message>
<message id="Lms.Admin.Users.users">Utilisateurs</message> <message id="Lms.Admin.Users.users">Utilisateurs</message>
<message id="Lms.Admin.Users.menu-users"><i class="fa fa-fw fa-users" aria-hidden="true"></i> Utilisateurs</message> <message id="Lms.Admin.Users.menu-users"><i class="fa fa-fw fa-users" aria-hidden="true"></i> Utilisateurs</message>
@@ -156,6 +155,9 @@
<message id="Lms.Explore.Release.copyright">Copyright</message> <message id="Lms.Explore.Release.copyright">Copyright</message>
<message id="Lms.Explore.Release.disc">Disque {1}</message> <message id="Lms.Explore.Release.disc">Disque {1}</message>
<!--Explore:TrackLists-->
<message id="Lms.Explore.TrackLists.del-tracklist-confirm">Supprimer la liste de lecture ?</message>
<!--Explore:Search--> <!--Explore:Search-->
<message id="Lms.Explore.Search.search-placeholder">Rechercher...</message> <message id="Lms.Explore.Search.search-placeholder">Rechercher...</message>
approot/messages_it.xml
+3 -2
View File
@@ -86,8 +86,7 @@
<!--Users--> <!--Users-->
<message id="Lms.Admin.Users.add">Nuovo utente</message> <message id="Lms.Admin.Users.add">Nuovo utente</message>
<message id="Lms.Admin.Users.admin">Amministratore</message> <message id="Lms.Admin.Users.admin">Amministratore</message>
<message id="Lms.Admin.Users.del-user">Elimina l'utente</message> <message id="Lms.Admin.Users.del-user-confirm">Elimina l'utente ?</message>
<message id="Lms.Admin.Users.del-user-name">Vuoi eliminare l'utente?</message>
<message id="Lms.Admin.Users.demo">Demo</message> <message id="Lms.Admin.Users.demo">Demo</message>
<message id="Lms.Admin.Users.users">Utenti</message> <message id="Lms.Admin.Users.users">Utenti</message>
<message id="Lms.Admin.Users.menu-users"><i class="fa fa-fw fa-users" aria-hidden="true"></i> Utenti</message> <message id="Lms.Admin.Users.menu-users"><i class="fa fa-fw fa-users" aria-hidden="true"></i> Utenti</message>
@@ -155,6 +154,8 @@
<message id="Lms.Explore.Release.copyright">Copyright</message> <message id="Lms.Explore.Release.copyright">Copyright</message>
<message id="Lms.Explore.Release.disc">Disco {1}</message> <message id="Lms.Explore.Release.disc">Disco {1}</message>
<!--Explore:TrackLists-->
<!--Explore:Search--> <!--Explore:Search-->
<message id="Lms.Explore.Search.search-placeholder">Ricerca...</message> <message id="Lms.Explore.Search.search-placeholder">Ricerca...</message>
approot/messages_zh.xml
+3 -2
View File
@@ -87,8 +87,7 @@
<!--Users--> <!--Users-->
<message id="Lms.Admin.Users.add">新建用户</message> <message id="Lms.Admin.Users.add">新建用户</message>
<message id="Lms.Admin.Users.admin">管理员</message> <message id="Lms.Admin.Users.admin">管理员</message>
<message id="Lms.Admin.Users.del-user">删除用户</message>
<message id="Lms.Admin.Users.del-user-name">确认要删除此用户？</message>
<message id="Lms.Admin.Users.demo">演示</message> <message id="Lms.Admin.Users.demo">演示</message>
<message id="Lms.Admin.Users.users">用户</message> <message id="Lms.Admin.Users.users">用户</message>
<message id="Lms.Admin.Users.menu-users"><i class="fa fa-fw fa-users" aria-hidden="true"></i> 用户</message> <message id="Lms.Admin.Users.menu-users"><i class="fa fa-fw fa-users" aria-hidden="true"></i> 用户</message>
@@ -156,6 +155,8 @@
<message id="Lms.Explore.Release.copyright">版权所有</message> <message id="Lms.Explore.Release.copyright">版权所有</message>
<message id="Lms.Explore.Release.disc">唱片 {1}</message> <message id="Lms.Explore.Release.disc">唱片 {1}</message>
<!--Explore:Search-->
<!--Explore:Search--> <!--Explore:Search-->
<message id="Lms.Explore.Search.search-placeholder">搜索中...</message> <message id="Lms.Explore.Search.search-placeholder">搜索中...</message>
approot/tracklists.xml
+16
View File
@@ -34,4 +34,20 @@
${loading-indicator} ${loading-indicator}
</message> </message>
<message id="Lms.Explore.TrackLists.template.delete-tracklist">
<div class="modal fade" tabindex="-1">
<div class="modal-dialog">
<div class="modal-content">
<div class="modal-header">
<h5 class="modal-title">${tr:Lms.Explore.TrackLists.del-tracklist-confirm}</h5>
<button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
</div>
<div class="modal-footer">
${del-btn class="btn btn-danger me-1"}${cancel-btn class="btn btn-secondary"}
</div>
</div>
</div>
</div>
</message>
</messages> </messages>
src/lms/ui/admin/UsersView.cpp
+6 -4
View File
@@ -111,11 +111,13 @@ UsersView::refreshView()
auto* delBtn {modal->bindNew<Wt::WPushButton>("del-btn", Wt::WString::tr("Lms.delete"))}; auto* delBtn {modal->bindNew<Wt::WPushButton>("del-btn", Wt::WString::tr("Lms.delete"))};
delBtn->clicked().connect([=] delBtn->clicked().connect([=]
{ {
auto transaction {LmsApp->getDbSession().createUniqueTransaction()}; {
auto transaction {LmsApp->getDbSession().createUniqueTransaction()};
User::pointer user {User::find(LmsApp->getDbSession(), userId)}; User::pointer user {User::find(LmsApp->getDbSession(), userId)};
if (user) if (user)
user.remove(); user.remove();
}
_container->removeWidget(entry); _container->removeWidget(entry);
src/lms/ui/explore/TrackListsView.cpp
+28 -1
View File
@@ -30,6 +30,7 @@
#include "ReleaseListHelpers.hpp" #include "ReleaseListHelpers.hpp"
#include "Filters.hpp" #include "Filters.hpp"
#include "LmsApplication.hpp" #include "LmsApplication.hpp"
#include "ModalManager.hpp"
#include "Utils.hpp" #include "Utils.hpp"
using namespace Database; using namespace Database;
@@ -125,7 +126,33 @@ namespace UserInterface
entry->bindNew<Wt::WPushButton>("delete", Wt::WString::tr("Lms.delete")) entry->bindNew<Wt::WPushButton>("delete", Wt::WString::tr("Lms.delete"))
->clicked().connect([=] ->clicked().connect([=]
{ {
// TODO auto modal {std::make_unique<Wt::WTemplate>(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<Wt::WPushButton>("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<Wt::WPushButton>("cancel-btn", Wt::WString::tr("Lms.cancel"))};
cancelBtn->clicked().connect([=]
{
LmsApp->getModalManager().dispose(modalPtr);
});
LmsApp->getModalManager().show(std::move(modal));
}); });
} }