From 89195fbcd7ba345ad18dd707d4d4514bb7a2718a Mon Sep 17 00:00:00 2001 From: Dario Date: Sun, 5 Jul 2020 11:09:18 +0200 Subject: [PATCH] mini changes hoping don't crash on staging anymore --- src/cpp/controller/User.cpp | 2 +- src/cpp/model/table/ModelBase.h | 4 ++-- src/cpp/tasks/VerificationEmailResendTask.cpp | 5 ++++- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/src/cpp/controller/User.cpp b/src/cpp/controller/User.cpp index 273ae2350..9b59a2609 100644 --- a/src/cpp/controller/User.cpp +++ b/src/cpp/controller/User.cpp @@ -337,7 +337,7 @@ namespace controller { em->sendErrorsAsEmail(); //return -1; } - printf("result_count: %d\n", result_count); + //printf("result_count: %d\n", result_count); if (result_count > 0) { auto now = Poco::DateTime(); diff --git a/src/cpp/model/table/ModelBase.h b/src/cpp/model/table/ModelBase.h index ac96ebc03..0de56cee5 100644 --- a/src/cpp/model/table/ModelBase.h +++ b/src/cpp/model/table/ModelBase.h @@ -195,9 +195,9 @@ namespace model { } catch (Poco::Exception& ex) { lock(); - addError(new ParamError(getTableName(), "mysql error by selecting", ex.displayText().data())); + addError(new ParamError(getTableName(), "mysql error by selecting", ex.displayText())); for (auto it = fieldNames.begin(); it != fieldNames.end(); it++) { - addError(new ParamError(getTableName(), "field name for select: ", it->data())); + addError(new ParamError(getTableName(), "field name for select: ", *it)); } //addError(new ParamError(getTableName(), "field name for select: ", fieldName.data())); unlock(); diff --git a/src/cpp/tasks/VerificationEmailResendTask.cpp b/src/cpp/tasks/VerificationEmailResendTask.cpp index 9380527bf..f11e36c69 100644 --- a/src/cpp/tasks/VerificationEmailResendTask.cpp +++ b/src/cpp/tasks/VerificationEmailResendTask.cpp @@ -33,9 +33,12 @@ int VerificationEmailResendTask::run() email_verification = controller::EmailVerificationCode::create(mUserId, model::table::EMAIL_OPT_IN_REGISTER_DIRECT); email_verification->getModel()->insertIntoDB(false); } + else { + email_verification->getModel()->addResendCountAndUpdate(); + } auto em = EmailManager::getInstance(); em->addEmail(new model::Email(email_verification, user, model::EMAIL_USER_VERIFICATION_CODE_RESEND)); - email_verification->getModel()->addResendCountAndUpdate(); + } return 0; }