Skip to content

Commit

Permalink
Fixed issue #6555: "display tokens" page empty/slow when there are to…
Browse files Browse the repository at this point in the history
…o many tokens - patch by siyang1982
  • Loading branch information
c-schmitz committed Sep 14, 2012
1 parent 43b8d44 commit 01a31b8
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions application/controllers/admin/tokens.php
Expand Up @@ -375,18 +375,18 @@ function getTokens_json($iSurveyId)
$limit = Yii::app()->request->getPost('rows');
$limit = isset($limit) ? $limit : 25; //Stop division by zero errors
$page = isset($page) ? $page : 1; //Stop division by zero errors
$tokens = Tokens_dynamic::model($iSurveyId)->findAll(array("order"=>$sidx. " ". $sord));
$tokens = Tokens_dynamic::model($iSurveyId)->findAll(array("order"=>$sidx. " ". $sord, "offset"=>($page - 1) * $limit, "limit"=>$limit));

$aData = new stdClass;
$aData->page = $page;
$aData->records = count($tokens);
$aData->records = Tokens_dynamic::model($iSurveyId)->count();
$aData->total = ceil($aData->records / $limit);

Yii::app()->loadHelper("surveytranslator");

$format = getDateFormatData(Yii::app()->session['dateformat']);

for ($i = 0, $j = ($page - 1) * $limit; $i < $limit && $j < $aData->records; $i++, $j++)
for ($i = 0, $j = 0; $i < $limit && $j < $limit; $i++, $j++)
{
$token = $tokens[$j];
if ((int) $token['validfrom'])
Expand Down

0 comments on commit 01a31b8

Please sign in to comment.