stian/gallery3
1
0
Fork 0
mirror of https://github.com/Pathduck/gallery3.git synced 2026-07-27 18:24:03 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

- All comments of an item can now be seen /comments?item_id=

Browse Source 
- Return proper Content-Type header for GET /comments requests
- Got rid of the query processing for index() in REST_Controller()
- Small misc fixes
This commit is contained in:
Jozef Selesi
2008-11-18 15:48:08 +00:00
parent d4fc15f76c
commit b63ea2cdbf
6 changed files with 45 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/comment/controllers/comments.php
+14 -4
View File
@@ -22,10 +22,17 @@ class Comments_Controller extends REST_Controller {
/**
* Display comments based on criteria.
* @see Rest_Controller::_delete($resource)
* @see Rest_Controller::_index()
*/
public function _index($query) {
throw new Exception("@todo Comment_Controller::_index NOT IMPLEMENTED");
public function _index() {
$item_id = $this->input->get('item_id');
if (empty($item_id)) {
/* We currently do not support getting all comments from the entire gallery. */
header("HTTP/1.1 400 Bad Request");
return;
}
print comment::get_comments($item_id, $this->get_output_format());
}
/**
@@ -51,15 +58,18 @@ class Comments_Controller extends REST_Controller {
/**
* Display an existing comment.
* @see Rest_Controller::_show($resource, $format)
* @todo Set proper Content-Type in a central place (REST_Controller::dispatch?).
* @see Rest_Controller::_show($resource, $output_format)
*/
public function _show($comment, $output_format) {
switch ($output_format) {
case "xml":
header("Content-Type: application/xml");
print xml::to_xml($comment->as_array(), array("comment"));
break;
case "json":
header("Content-Type: application/json");
print json_encode($comment->as_array());
break;
modules/comment/helpers/comment.php
+10 -2
View File
@@ -105,17 +105,25 @@ class Comment_Core {
return $block;
}
static function get_comments($item, $output_format) {
$comments = ORM::factory('comment')->where('item_id', $item->id)
// @todo Set proper Content-Type in a central place (REST_Controller::dispatch?).
static function get_comments($item_id, $output_format) {
$comments = ORM::factory('comment')->where('item_id', $item_id)
->orderby('datetime', 'asc')
->find_all();
if (!$comments->count()) {
header("HTTP/1.1 400 Bad Request");
return;
}
switch ($output_format) {
case "xml":
header("Content-Type: application/xml");
return xml::to_xml($comments, array("comments", "comment"));
break;
case "json":
header("Content-Type: application/json");
foreach ($comments as $comment) {
$data[] = $comment->as_array();
}