stian/gallery3
1
0
Fork 0
mirror of https://github.com/Pathduck/gallery3.git synced 2026-08-23 07:15:50 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix some broken-ness:

Browse Source 
1) Item_Controller::_create() and _update() were swapped
2) _create() was redirecting to the wrong urls on success
3) Change in-place return parameter from __return to _return
4) Change in-place code to tunnel _put via POST
This commit is contained in:
Bharat Mediratta
2008-11-19 06:35:54 +00:00
parent e14d5574b6
commit 161998dde6
3 changed files with 7 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/controllers/items.php
+6 -8
View File
@@ -48,11 +48,9 @@ class Items_Controller extends REST_Controller {
return url::redirect("{$item->type}s}/$item->id");
}
public function _update($item) {
public function _create($item) {
// @todo Productionize this code
// 1) Add security checks
// 2) Support owner_ids properly
$user = Session::instance()->get("user");
$owner_id = $user ? $user->id : $item->owner_id;
@@ -64,7 +62,7 @@ class Items_Controller extends REST_Controller {
$this->input->post("title", $this->input->post("name")),
$this->input->post("description"),
$owner_id);
url::redirect("album/{$album->id}");
url::redirect("albums/{$album->id}");
break;
case "photo":
@@ -81,7 +79,7 @@ class Items_Controller extends REST_Controller {
throw new Exception("@todo ERROR_IN_UPLOAD_FILE");
}
}
url::redirect("album/{$item->id}");
url::redirect("albums/{$item->id}");
} else {
$photo = photo::create(
$item->id,
@@ -106,7 +104,7 @@ class Items_Controller extends REST_Controller {
url::redirect("{$parent->type}s/{$parent->id}");
}
public function _create($item) {
public function _update($item) {
// @todo Productionize this
// 1) Figure out how to do the right validation here. Validate the form input and apply it to
// the model as appropriate.
@@ -133,8 +131,8 @@ class Items_Controller extends REST_Controller {
// parent_id, owner_id
$item->save();
if (array_key_exists("__return", $post)) {
print $item->{$post["__return"]};
if (array_key_exists("_return", $post)) {
print $item->{$post["_return"]};
}
}
}