From 097f1a33f9ef10e03a1c429ad7b2819cde623811 Mon Sep 17 00:00:00 2001 From: Dario via Pythagoras Date: Sun, 31 Oct 2021 10:54:51 +0100 Subject: [PATCH 1/3] fix user search --- login_server/src/cpp/controller/User.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/login_server/src/cpp/controller/User.cpp b/login_server/src/cpp/controller/User.cpp index 576b2b8c8..0ff299309 100644 --- a/login_server/src/cpp/controller/User.cpp +++ b/login_server/src/cpp/controller/User.cpp @@ -69,7 +69,7 @@ namespace controller { using namespace Poco::Data::Keywords; Poco::Data::Statement select(session); - select << "SELECT id, first_name, last_name, email, username, description, pubkey, created, email_checked, disabled, group_id FROM " << db->getTableName(); + select << "SELECT id, first_name, last_name, email, username, description, pubkey, created, email_checked, disabled, group_id, publisher_id FROM " << db->getTableName(); select << " where email_checked = 0 "; select, into(resultFromDB); if (searchString != "") { From 823265771877094bba4def60705baff79487cc52 Mon Sep 17 00:00:00 2001 From: Dario via Pythagoras Date: Sun, 31 Oct 2021 11:09:31 +0100 Subject: [PATCH 2/3] fix defekt abort transaction button --- login_server/src/cpsp/CheckTransaction.cpsp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/login_server/src/cpsp/CheckTransaction.cpsp b/login_server/src/cpsp/CheckTransaction.cpsp index d866384b7..d303db8c3 100644 --- a/login_server/src/cpsp/CheckTransaction.cpsp +++ b/login_server/src/cpsp/CheckTransaction.cpsp @@ -74,7 +74,8 @@ enum PageState { { //mSession->finalizeTransaction(false, true); // - if(!transaction.isNull() && transaction->getModel()->getUserId() == user_model->getID()) + if(!transaction.isNull() && + (transaction_body->isCreation() || transaction->getModel()->getUserId() == user_model->getID())) { if(pt->removeTask(transaction)) { transaction->deleteFromDB(); @@ -150,7 +151,7 @@ enum PageState { transaction_body = transaction->getTransactionBody(); // user can only delete there own transactions // TODO: Auto timeout for community transactions - if(transaction->getModel()->getUserId() == user_model->getID()) { + if(transaction_body->isCreation() || transaction->getModel()->getUserId() == user_model->getID()) { transaction_removeable = true; } } @@ -354,4 +355,4 @@ enum PageState { -<%@ include file="include/footer_chr.cpsp" %> \ No newline at end of file +<%@ include file="include/footer_chr.cpsp" %> From 5bf98f20eb691d30c706281b63e11c359268c3ef Mon Sep 17 00:00:00 2001 From: Dario via Pythagoras Date: Wed, 3 Nov 2021 09:57:48 +0100 Subject: [PATCH 3/3] move skip button before abort button --- login_server/src/cpsp/CheckTransaction.cpsp | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/login_server/src/cpsp/CheckTransaction.cpsp b/login_server/src/cpsp/CheckTransaction.cpsp index d303db8c3..f0c56c100 100644 --- a/login_server/src/cpsp/CheckTransaction.cpsp +++ b/login_server/src/cpsp/CheckTransaction.cpsp @@ -339,16 +339,15 @@ enum PageState { <%= gettext("Transaktion unterzeichnen") %> <% } %> + <% if(transaction_removeable) { %> - <% } else { %> - <% } %> <% } %>