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 check transaction page

Browse Source
This commit is contained in:
einhorn_b 2021-07-15 11:55:25 +02:00
parent cee7d7ac3c
commit 49bada7839
1 changed files with 16 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
login_server/src/cpsp/CheckTransaction.cpsp
View File

@ -134,7 +134,7 @@ enum PageState {
std::vector<Poco::AutoPtr<model::gradido::Transaction>> transactions_to_sign;
bool transaction_removeable = false;
int transaction_to_sign_index = 0;
if(!transaction.isNull())
if(transaction.isNull())
{
if(transactions_user_must_sign.size() > skip_count) {
transactions_to_sign = transactions_user_must_sign;
@ -143,7 +143,7 @@ enum PageState {
transactions_to_sign = transactions_someone_must_sign;
transaction_to_sign_index = skip_count - transactions_user_must_sign.size();
}
if(transactions_to_sign.size() > transaction_to_sign_index)
{
transaction = transactions_to_sign[transaction_to_sign_index];
@ -200,7 +200,7 @@ enum PageState {
}
}
std::clog << "state: " << std::to_string(state) << std::endl;
%><%@ include file="include/header_navi_chr.cpsp" %>
<%= getErrorsHtml() %>
@ -267,18 +267,19 @@ enum PageState {
</div>
</div>
<% } else if(PAGE_TRANSACTION_GROUP_ADD_MEMBER == state) {
auto groupMemberUpdateTransaction = transaction_body->getGroupMemberUpdate();
auto groups = controller::Group::load(groupMemberUpdateTransaction->getTargetGroupAlias());
Poco::AutoPtr<model::table::Group> group_model;
Poco::AutoPtr<controller::User> user;
if(groups.size() == 1 && !groups[0].isNull()) group_model = groups[0]->getModel();
auto user_id = transaction->getModel()->getUserId();
if(user_id == user_model->getID()) {
user = account_user;
} else {
user = controller::User::sload(user_id);
}
%>
auto groupMemberUpdateTransaction = transaction_body->getGroupMemberUpdate();
auto groups = controller::Group::load(groupMemberUpdateTransaction->getTargetGroupAlias());
Poco::AutoPtr<model::table::Group> group_model;
Poco::AutoPtr<controller::User> user;
if(groups.size() == 1 && !groups[0].isNull()) group_model = groups[0]->getModel();
auto user_id = transaction->getModel()->getUserId();
if(user_id == user_model->getID()) {
user = account_user;
} else {
user = controller::User::sload(user_id);
}
%>
<p><%= gettext("Benutzer zu einer Gruppe hinzufügen") %></p>
<div class="content-table">
<p><% if(!user.isNull()) { %>