All4DK
/
wikipoints
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

FIX чуть поправлена модель, в JSON-контроллере в категориях отдаётся массив объектов

This commit is contained in:
Krivchikov Dmitry 2015-09-03 00:23:48 +03:00
parent 427ea18f17
commit efa1fba20e
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ground/classes/Model.php
View File

@ -156,10 +156,14 @@ abstract class Model
while ($res && $row = $res->fetch(PDO::FETCH_ASSOC)) { while ($res && $row = $res->fetch(PDO::FETCH_ASSOC)) {
if (isset($params['noKeys'])) { if (isset($params['noKeys'])) {
$ready[] = isset($params['asArray']) && $params['asArray'] ? $row : new $calledClass($row); $ready[] = isset($params['asArray']) && $params['asArray'] ? $row : new $calledClass($row);
} else {
if (isset($params['asArrayOf'])) {
$ready[] = isset($params['asArray']) && $params['asArray'] ? $row : new $calledClass($row);
} else { } else {
$ready[$row[$this->_primaryKey_]] = isset($params['asArray']) && $params['asArray'] ? $row : new $calledClass($row); $ready[$row[$this->_primaryKey_]] = isset($params['asArray']) && $params['asArray'] ? $row : new $calledClass($row);
} }
} }
}
return (isset($params['limit']) && $params['limit'] == 1) ? array_shift($ready) : $ready; return (isset($params['limit']) && $params['limit'] == 1) ? array_shift($ready) : $ready;
} }

2
ground/controllers/JsonController.php
View File

@ -93,7 +93,7 @@ class JsonController extends Controller
*/ */
static function actionCategories() static function actionCategories()
{ {
$categories = Category::model()->getAll(array('order' => 'ord ASC', 'asArray' => true)); $categories = Category::model()->getAll(array('order' => 'ord ASC', 'asArray' => true, 'asArrayOf' => true));
self::renderPartial('json.php', array( self::renderPartial('json.php', array(
'data' => $categories, 'data' => $categories,