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 != "") {
diff --git a/login_server/src/cpsp/CheckTransaction.cpsp b/login_server/src/cpsp/CheckTransaction.cpsp
index d866384b7..f0c56c100 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;
}
}
@@ -338,20 +339,19 @@ enum PageState {
<%= gettext("Transaktion unterzeichnen") %>
<% } %>
+
<% if(transaction_removeable) { %>
- <% } else { %>
-
<% } %>
<% } %>
-<%@ include file="include/footer_chr.cpsp" %>
\ No newline at end of file
+<%@ include file="include/footer_chr.cpsp" %>