stv0g/vzlogger
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

ignores NULL as return value for controllers

Browse source
This commit is contained in:
Steffen Vogel 2011-01-03 09:24:53 +01:00
parent 658e184feb
commit f291de8377
1 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
lib/View/JSON.php
View file

@ -81,7 +81,7 @@ class JSON extends View {
elseif ($data instanceof Util\JSON || is_array($data)) {
$this->addArray($data);
}
else {
elseif (isset($data)) { // ignores NULL data
throw new \Exception('Can\'t show ' . get_class($data));
}
}
@ -223,19 +223,24 @@ class JSON extends View {
'last' => (isset($data[count($data)-1][0])) ? $data[count($data)-1][0] : NULL,
'min' => $interpreter->getMin(),
'max' => $interpreter->getMax(),
'average' => $interpreter->getAverage(),
'tuples' => $data
'average' => $interpreter->getAverage(),
'tuples' => $data
);
}
/**
* Insert array in output
*
* @todo required?
* @todo fix workaround for public entities
*/
protected function addArray($data) {
foreach ($data as $index => $value) {
$this->json[$index] = $value;
if ($value instanceof Model\Entity) {
$this->json['entities'][] = self::convertEntity($value);
}
else {
$this->json[$index] = $value;
}
}
}