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 rebase conflicts :(

Browse Source
This commit is contained in:
einhorn_b 2021-07-15 12:36:44 +02:00
commit 332907034d
1 changed files with 0 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
login_server/src/cpp/SingletonManager/PendingTasksManager.cpp
View File

@ -162,13 +162,10 @@ std::vector<Poco::AutoPtr<model::gradido::Transaction>> PendingTasksManager::get
// TODO: don't use cast here, because can lead to errors // TODO: don't use cast here, because can lead to errors
Poco::ScopedLock<Poco::Mutex> _lock(mWorkMutex); Poco::ScopedLock<Poco::Mutex> _lock(mWorkMutex);
std::vector<Poco::AutoPtr<model::gradido::Transaction>> transactions_to_sign; std::vector<Poco::AutoPtr<model::gradido::Transaction>> transactions_to_sign;
<<<<<<< HEAD
if (user->getModel()->getRole() != model::table::ROLE_ADMIN) { if (user->getModel()->getRole() != model::table::ROLE_ADMIN) {
return transactions_to_sign; return transactions_to_sign;
} }
=======
>>>>>>> Remove dynamic cast because it lead to errors again and agin (Poco::AutoPtr don't work correct with that)
for (auto map_it = mPendingGradidoTransactions.begin(); map_it != mPendingGradidoTransactions.end(); map_it++) for (auto map_it = mPendingGradidoTransactions.begin(); map_it != mPendingGradidoTransactions.end(); map_it++)
{ {