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

check also grup table for group url if no node server entry exist

Browse Source
This commit is contained in:
Dario 2020-11-30 09:51:04 +01:00 committed by Ulf Gebhardt
parent da0c77827f
commit 7230a07085
No known key found for this signature in database
GPG Key ID: 81308EFE29ABFEBD
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/cpp/controller/User.cpp
View File

@ -8,6 +8,7 @@
#include "../SingletonManager/SingletonTaskObserver.h" #include "../SingletonManager/SingletonTaskObserver.h"
#include "NodeServer.h" #include "NodeServer.h"
#include "Group.h"
#include "../lib/DataTypeConverter.h" #include "../lib/DataTypeConverter.h"
@ -529,7 +530,14 @@ namespace controller {
auto model = getModel(); auto model = getModel();
if (!model->getGroupId()) return ServerConfig::g_php_serverPath; if (!model->getGroupId()) return ServerConfig::g_php_serverPath;
auto servers = controller::NodeServer::load(model::table::NODE_SERVER_GRADIDO_COMMUNITY, model->getGroupId()); auto servers = controller::NodeServer::load(model::table::NODE_SERVER_GRADIDO_COMMUNITY, model->getGroupId());
if (!servers.size()) return ServerConfig::g_php_serverPath; if (!servers.size()) {
auto group = controller::Group::load(model->getGroupId());
if (!group.isNull()) {
mGroupBaseUrl = group->getModel()->getUrl();
return mGroupBaseUrl;
}
return ServerConfig::g_php_serverPath;
}
if (servers.size() > 1) { if (servers.size() > 1) {
auto em = ErrorManager::getInstance(); auto em = ErrorManager::getInstance();
em->addError(new ParamError(function_name, "error, more than one community server found for group", model->getGroupId())); em->addError(new ParamError(function_name, "error, more than one community server found for group", model->getGroupId()));

3
src/cpp/tasks/HederaTask.cpp
View File

@ -140,7 +140,8 @@ int HederaTask::tryQueryReceipt()
} }
else { else {
if (response.getResponseCode() == proto::NOT_SUPPORTED) { if (response.getResponseCode() == proto::NOT_SUPPORTED) {
addError(new ParamError(function_name, "query in json-format:", query->toJsonString()));
//query->toJsonString()
return -3; return -3;
} }
mLastCheck = Poco::Timestamp(); mLastCheck = Poco::Timestamp();