Merge pull request #201 from timble/feature/199-entity-route2

jebbdomingo · web-flow · commit 8b9048fea854 · 2019-07-22T09:30:37.000+08:00
JSON resource structure
diff --git a/code/view/json.php b/code/view/json.php
@@ -168,7 +168,7 @@ protected function _fetchData(ViewContext $context)
                 $output['links']['prev'] = $url->setQuery(array('offset' => max($offset-$limit, 0)), true)->toString();
             }
         }
-        else $output['data'] = $this->_createResource($model->fetch());
+        else $output['data'] = $this->_createResource($model->fetch()->getIterator()->current());
 
         if ($this->_included_resources) {
             $output['included'] = array_values($this->_included_resources);

Original file line number	Diff line number	Diff line change
`@@ -168,7 +168,7 @@ protected function _fetchData(ViewContext $context)`
`168`	`168`	`$output['links']['prev'] = $url->setQuery(array('offset' => max($offset-$limit, 0)), true)->toString();`
`169`	`169`	`}`
`170`	`170`	`}`
`171`		`- else $output['data'] = $this->_createResource($model->fetch());`
	`171`	`+ else $output['data'] = $this->_createResource($model->fetch()->getIterator()->current());`
`172`	`172`
`173`	`173`	`if ($this->_included_resources) {`
`174`	`174`	`$output['included'] = array_values($this->_included_resources);`