Skip to content

Commit

Permalink
fixes yupe#1937
Browse files Browse the repository at this point in the history
  • Loading branch information
sabian committed Mar 25, 2015
1 parent e9b4ce2 commit 07a3ed9
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 3 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@
- #1879: Исправлена генерация урлов. Подключён компонент 2amigos/transliteration-helper, YText::translit теперь использует его. Клиентская транслитерация liTranslit заменена на бэкенд. Добавлен \yupe\widgets\ActiveForm (@chemezov)
- #1849: Исправлена работа с MySQL 5.6 (@chemezov)
- #1917: SEO: Добавлен компонент chemezov/yii-seo. Лэйауты и вьюхи подогнаны под него. В модели добавлено поведение, которое позволяет вызывать функции getUrl/getAbsoluteUrl, возвращающие url к текущей модели. Обратная совместимость сохранена (@chemezov)
- #1937: Исправлена пагинация в модуле Новости (@sabian)

Версия 0.9.3 10 февраля 2015
-------------------------------------
Expand Down
8 changes: 6 additions & 2 deletions protected/modules/news/controllers/NewsController.php
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,6 @@ public function actionIndex()
'params' => [
':status' => News::STATUS_PUBLISHED,
],
'limit' => $this->module->perPage,
'order' => 't.creation_date DESC',
'with' => ['user'],
]);
Expand All @@ -69,7 +68,12 @@ public function actionIndex()
);
}

$dataProvider = new CActiveDataProvider('News', ['criteria' => $dbCriteria]);
$dataProvider = new CActiveDataProvider('News', [
'criteria' => $dbCriteria,
'pagination' => [
'pageSize' => $this->module->perPage
]
]);
$this->render('index', ['dataProvider' => $dataProvider]);
}
}
2 changes: 1 addition & 1 deletion themes/default/views/news/news/index.php
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<h1>Новости</h1>

<?php $this->widget(
'zii.widgets.CListView',
'bootstrap.widgets.TbListView',
[
'dataProvider' => $dataProvider,
'itemView' => '_view',
Expand Down

0 comments on commit 07a3ed9

Please sign in to comment.