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

[UI] Restore the playing queue when creating the session

Browse Source
This commit is contained in:
emeric
2015-04-04 22:33:08 +02:00
parent 0378c242b6
commit c14da64d56
7 changed files with 86 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ui/settings/Settings.cpp
+10 -5
View File
@@ -59,12 +59,17 @@ _sessionData(sessionData)
hLayout->addWidget(menu);
hLayout->addWidget(contents, 1);
Wt::Dbo::Transaction transaction( sessionData.getDatabaseHandler().getSession());
::Database::User::pointer user = sessionData.getDatabaseHandler().getCurrentUser();
std::string userId;
bool userIsAdmin;
{
Wt::Dbo::Transaction transaction( sessionData.getDatabaseHandler().getSession());
::Database::User::pointer user = sessionData.getDatabaseHandler().getCurrentUser();
userId = Database::User::getId(user);
userIsAdmin = user->isAdmin();
}
menu->addItem("Audio", new AudioFormView(sessionData));
if (user->isAdmin())
if (userIsAdmin)
{
MediaDirectories* mediaDirectory = new MediaDirectories(sessionData);
mediaDirectory->changed().connect(this, &Settings::handleDatabaseDirectoriesChanged);
@@ -78,7 +83,7 @@ _sessionData(sessionData)
}
else
{
menu->addItem("Account", new AccountFormView(sessionData, Database::User::getId(user)));
menu->addItem("Account", new AccountFormView(sessionData, userId));
}
}