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

Split the LMS_LOG macro to work either with a ostream logger or a wt logger

Browse Source
This commit is contained in:
emeric
2019-11-19 18:14:23 +01:00
parent 9259ec19e1
commit b69e0c0c3d
32 changed files with 282 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ui/admin/DatabaseSettingsView.cpp
+2 -2
View File
@@ -232,7 +232,7 @@ DatabaseSettingsView::refreshView()
{
model->saveData();
getService<Scanner::MediaScanner>()->requestReschedule();
ServiceProvider<Scanner::MediaScanner>::get()->requestReschedule();
LmsApp->notifyMsg(MsgType::Success, Wt::WString::tr("Lms.Admin.Database.settings-saved"));
}
@@ -249,7 +249,7 @@ DatabaseSettingsView::refreshView()
immScanBtn->clicked().connect([=] ()
{
getService<Scanner::MediaScanner>()->requestImmediateScan();
ServiceProvider<Scanner::MediaScanner>::get()->requestImmediateScan();
LmsApp->notifyMsg(MsgType::Info, Wt::WString::tr("Lms.Admin.Database.scan-launched"));
});
src/ui/admin/DatabaseStatus.cpp
+1 -1
View File
@@ -136,7 +136,7 @@ DatabaseStatus::refreshContents()
Wt::WPushButton* reportBtn {bindNew<Wt::WPushButton>("btn-report", Wt::WString::tr("Lms.Admin.Database.Status.get-report"))};
const MediaScanner::Status status {getService<MediaScanner>()->getStatus()};
const MediaScanner::Status status {ServiceProvider<MediaScanner>::get()->getStatus()};
if (status.lastCompleteScanStats)
{
bindString("last-scan", Wt::WString::tr("Lms.Admin.Database.Status.last-scan-status")
src/ui/admin/InitWizardView.cpp
+2 -2
View File
@@ -55,7 +55,7 @@ class InitWizardModel : public Wt::WFormModel
void saveData()
{
const Database::User::PasswordHash passwordHash {getService<::Auth::PasswordService>()->hashPassword(valueText(PasswordField).toUTF8())};
const Database::User::PasswordHash passwordHash {ServiceProvider<::Auth::PasswordService>::get()->hashPassword(valueText(PasswordField).toUTF8())};
auto transaction(LmsApp->getDbSession().createUniqueTransaction());
@@ -77,7 +77,7 @@ class InitWizardModel : public Wt::WFormModel
if (!valueText(PasswordField).empty())
{
// Evaluate the strength of the password
if (!getService<::Auth::PasswordService>()->evaluatePasswordStrength(valueText(AdminLoginField).toUTF8(), valueText(PasswordField).toUTF8()))
if (!ServiceProvider<::Auth::PasswordService>::get()->evaluatePasswordStrength(valueText(AdminLoginField).toUTF8(), valueText(PasswordField).toUTF8()))
error = Wt::WString::tr("Lms.password-too-weak");
}
else
src/ui/admin/UserView.cpp
+3 -3
View File
@@ -82,7 +82,7 @@ class UserModel : public Wt::WFormModel
{
std::optional<Database::User::PasswordHash> passwordHash;
if (!valueText(PasswordField).empty())
passwordHash = getService<::Auth::PasswordService>()->hashPassword(valueText(PasswordField).toUTF8());
passwordHash = ServiceProvider<::Auth::PasswordService>::get()->hashPassword(valueText(PasswordField).toUTF8());
auto transaction {LmsApp->getDbSession().createUniqueTransaction()};
@@ -174,7 +174,7 @@ class UserModel : public Wt::WFormModel
else
{
// Evaluate the strength of the password for non demo accounts
if (!getService<::Auth::PasswordService>()->evaluatePasswordStrength(getLoginName(), valueText(PasswordField).toUTF8()))
if (!ServiceProvider<::Auth::PasswordService>::get()->evaluatePasswordStrength(getLoginName(), valueText(PasswordField).toUTF8()))
error = Wt::WString::tr("Lms.password-too-weak");
}
}
@@ -270,7 +270,7 @@ UserView::refreshView()
// Demo account
t->setFormWidget(UserModel::DemoField, std::make_unique<Wt::WCheckBox>());
if (!userId && getService<Config>()->getBool("demo", false))
if (!userId && ServiceProvider<Config>::get()->getBool("demo", false))
t->setCondition("if-demo", true);
Wt::WPushButton* saveBtn = t->bindNew<Wt::WPushButton>("save-btn", Wt::WString::tr(userId ? "Lms.save" : "Lms.create"));