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 naming

Browse Source
This commit is contained in:
Dario Rekowski on RockPI 2021-03-03 13:54:53 +00:00 committed by Ulf Gebhardt
parent ba46e6b458
commit 130397e2bb
No known key found for this signature in database
GPG Key ID: 81308EFE29ABFEBD
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/Controller/AppController.php
View File

@ -161,11 +161,11 @@ class AppController extends Controller
if ($session_id != 0) {
$userStored = $session->read('StateUser');
$transactionPendings = $session->read('Transaction.pending');
$transactionExecutings = $session->read('Transaction.executing');
$transaction_can_signed = $session->read('Transaction.can_signed');
$transactionPendings = $session->read('Transactions.pending');
$transactionExecutings = $session->read('Transactions.executing');
$transaction_can_signed = $session->read('Transactions.can_signed');
if ($session->read('session_id') != $session_id ||
( $userStored && (!isset($userStored['id']) || !$userStored['email_checked'])) ||
intval($transactionPendings) > 0 ||
@ -192,13 +192,13 @@ class AppController extends Controller
$session->write('StateUser.' . $key, $value);
}
//var_dump($json);
$transactionPendings = $json['Transaction.pending'];
$transactionExecuting = $json['Transaction.executing'];
$transaction_can_signed = $json['Transaction.can_signed'];
$transactionPendings = $json['Transactions.pending'];
$transactionExecuting = $json['Transactions.executing'];
$transaction_can_signed = $json['Transactions.can_signed'];
//echo "read transaction pending: $transactionPendings<br>";
$session->write('Transaction.pending', $transactionPendings);
$session->write('Transaction.executing', $transactionExecuting);
$session->write('Transaction.can_signed', $transaction_can_signed);
$session->write('Transactions.pending', $transactionPendings);
$session->write('Transactions.executing', $transactionExecuting);
$session->write('Transactions.can_signed', $transaction_can_signed);
$session->write('session_id', $session_id);
$stateUserTable = TableRegistry::getTableLocator()->get('StateUsers');

2
src/Template/Element/navi_notify.ctp
View File

@ -11,7 +11,7 @@ use Cake\Routing\Router;
$session = $this->getRequest()->getSession();
$errorCount = intval($session->read('StateUser.errorCount'));
$transactionPendings = $session->read('Transactions.pending');
$transactionPendings += $session->read('Transaction.can_signed');
$transactionPendings += $session->read('Transactions.can_signed');
/*
class NavHeaderEntry