From 1a5d216b7a1c820212121a553570137a818673e0 Mon Sep 17 00:00:00 2001 From: Sebastian Grewe Date: Tue, 23 Jul 2013 09:08:57 +0200 Subject: [PATCH] Allow adjusting the tx row limit --- public/include/pages/admin/transactions.inc.php | 12 +++++++----- .../templates/mmcFE/admin/transactions/default.tpl | 6 +++--- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/public/include/pages/admin/transactions.inc.php b/public/include/pages/admin/transactions.inc.php index 2c1126ba..6089858a 100644 --- a/public/include/pages/admin/transactions.inc.php +++ b/public/include/pages/admin/transactions.inc.php @@ -10,18 +10,20 @@ if (!$user->isAuthenticated() || !$user->isAdmin($_SESSION['USERDATA']['id'])) { } if (!$smarty->isCached('master.tpl', $smarty_cache_key)) { + $iLimit = 30; $debug->append('No cached version available, fetching from backend', 3); - $aTransactions = $transaction->getAllTransactions(@$_REQUEST['start'], @$_REQUEST['filter'], 5); + $aTransactions = $transaction->getAllTransactions(@$_REQUEST['start'], @$_REQUEST['filter'], $iLimit); $iCountTransactions = $transaction->getCountAllTransactions(); $aTransactionTypes = $transaction->getTypes(); if (!$aTransactions) $_SESSION['POPUP'][] = array('CONTENT' => 'Could not find any transaction', 'TYPE' => 'errormsg'); + $smarty->assign('LIMIT', $iLimit); + $smarty->assign('TRANSACTIONS', $aTransactions); + $smarty->assign('TRANSACTIONTYPES', $aTransactionTypes); + $smarty->assign('TXSTATUS', array('' => '', 'Confirmed' => 'Confirmed', 'Unconfirmed' => 'Unconfirmed', 'Orphan' => 'Orphan')); + $smarty->assign('COUNTTRANSACTIONS', $iCountTransactions); } else { $debug->append('Using cached page', 3); } -$smarty->assign('TRANSACTIONS', $aTransactions); -$smarty->assign('TRANSACTIONTYPES', $aTransactionTypes); -$smarty->assign('TXSTATUS', array('' => '', 'Confirmed' => 'Confirmed', 'Unconfirmed' => 'Unconfirmed', 'Orphan' => 'Orphan')); -$smarty->assign('COUNTTRANSACTIONS', $iCountTransactions); $smarty->assign('CONTENT', 'default.tpl'); ?> diff --git a/public/templates/mmcFE/admin/transactions/default.tpl b/public/templates/mmcFE/admin/transactions/default.tpl index b9833bad..fff98814 100644 --- a/public/templates/mmcFE/admin/transactions/default.tpl +++ b/public/templates/mmcFE/admin/transactions/default.tpl @@ -3,7 +3,7 @@ -{if $COUNTTRANSACTIONS / 5 > 1} +{if $COUNTTRANSACTIONS / $LIMIT > 1} {if $smarty.request.start > 0} {else} @@ -12,8 +12,8 @@ {/if} -{if $COUNTTRANSACTIONS / 5 > 1} - {if $COUNTTRANSACTIONS - $smarty.request.start - 5 > 0} +{if $COUNTTRANSACTIONS / $LIMIT > 1} + {if $COUNTTRANSACTIONS - $smarty.request.start - $LIMIT > 0} {else}