diff --git a/ground/classes/Model.php b/ground/classes/Model.php index 2533b6d..c1f8645 100644 --- a/ground/classes/Model.php +++ b/ground/classes/Model.php @@ -157,7 +157,11 @@ abstract class Model if (isset($params['noKeys'])) { $ready[] = isset($params['asArray']) && $params['asArray'] ? $row : new $calledClass($row); } else { - $ready[$row[$this->_primaryKey_]] = isset($params['asArray']) && $params['asArray'] ? $row : new $calledClass($row); + if (isset($params['asArrayOf'])) { + $ready[] = isset($params['asArray']) && $params['asArray'] ? $row : new $calledClass($row); + } else { + $ready[$row[$this->_primaryKey_]] = isset($params['asArray']) && $params['asArray'] ? $row : new $calledClass($row); + } } } diff --git a/ground/controllers/JsonController.php b/ground/controllers/JsonController.php index 545e977..5615831 100644 --- a/ground/controllers/JsonController.php +++ b/ground/controllers/JsonController.php @@ -93,7 +93,7 @@ class JsonController extends Controller */ 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( 'data' => $categories,