IT4Change/gradido
3
0
Fork 0
mirror of https://github.com/IT4Change/gradido.git synced 2025-12-13 07:45:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix naming (differ from community server), enable back request transactions from gn

Browse Source
This commit is contained in:
einhornimmond 2021-03-03 14:50:21 +01:00 committed by Ulf Gebhardt
parent 82f39c3add
commit e49802c9bc
No known key found for this signature in database
GPG Key ID: 81308EFE29ABFEBD
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/cpp/JSONInterface/JsonGetLogin.cpp
View File

@ -76,17 +76,17 @@ Poco::JSON::Object* JsonGetLogin::handle(Poco::Dynamic::Var params)
int pending = 0; int pending = 0;
auto user_must_sign = pt->getTransactionsUserMustSign(userNew); auto user_must_sign = pt->getTransactionsUserMustSign(userNew);
pending = user_must_sign.size(); pending = user_must_sign.size();
result->set("Transaction.pending", pending); result->set("Transactions.pending", pending);
auto some_must_sign = pt->getTransactionSomeoneMustSign(userNew); auto some_must_sign = pt->getTransactionSomeoneMustSign(userNew);
//pending = some_must_sign.size(); //pending = some_must_sign.size();
result->set("Transaction.can_signed", some_must_sign.size()); result->set("Transactions.can_signed", some_must_sign.size());
auto executing = observer->getTaskCount(userModel->getEmail(), TASK_OBSERVER_SIGN_TRANSACTION); auto executing = observer->getTaskCount(userModel->getEmail(), TASK_OBSERVER_SIGN_TRANSACTION);
if (executing < 0) { if (executing < 0) {
executing = 0; executing = 0;
} }
result->set("Transaction.executing", executing); result->set("Transactions.executing", executing);
//printf("pending: %d\n", session->getProcessingTransactionCount()); //printf("pending: %d\n", session->getProcessingTransactionCount());
//std::string user_string = userModel->toString(); //std::string user_string = userModel->toString();
//printf("[JsonGetLogin] %s\n", user_string.data()); //printf("[JsonGetLogin] %s\n", user_string.data());

4
src/cpp/SingletonManager/CronManager.cpp
View File

@ -193,8 +193,8 @@ int PingServerTask::run()
std::string url_port = mNodeServer->getModel()->getUrlWithPort(); std::string url_port = mNodeServer->getModel()->getUrlWithPort();
printf("%s [PingServerTask::run] call update for %s\n", Poco::DateTimeFormatter::format(current, "%d.%m.%y %H:%M:%S.%i").data(), url_port.data()); printf("%s [PingServerTask::run] call update for %s\n", Poco::DateTimeFormatter::format(current, "%d.%m.%y %H:%M:%S.%i").data(), url_port.data());
//auto json_request = mNodeServer->createJsonRequest(); auto json_request = mNodeServer->createJsonRequest();
//json_request.request("updateReadNode"); json_request.request("updateReadNode");
} }
return 0; return 0;
} }