stian/gallery3
1
0
Fork 0
mirror of https://github.com/Pathduck/gallery3.git synced 2026-08-18 21:05:01 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

Pass along the from_id in item::get_delete_form() and then check to

Browse Source 
see if we're deleting the album we're inside in quick::delete.  If we
delete the album we're currently viewing, redirect to the parent.

This fixes ticket #1185.
This commit is contained in:
Bharat Mediratta
2010-07-10 12:00:06 -07:00
parent 307e47c3d0
commit 7ca201b118
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/gallery/controllers/quick.php
+3 -1
View File
@@ -119,7 +119,9 @@ class Quick_Controller extends Controller {
$item->delete();
message::success($msg);
if (Input::instance()->get("page_type") == "collection") {
$from_id = Input::instance()->get("from_id");
if (Input::instance()->get("page_type") == "collection" &&
$from_id != $id /* deleted the item we were viewing */) {
print json_encode(array("result" => "success", "reload" => 1));
} else {
print json_encode(array("result" => "success",
modules/gallery/helpers/item.php
+3 -1
View File
@@ -158,8 +158,10 @@ class item_Core {
*/
static function get_delete_form($item) {
$page_type = Input::instance()->get("page_type");
$from_id = Input::instance()->get("from_id");
$form = new Forge(
"quick/delete/$item->id?page_type=$page_type", "", "post", array("id" => "g-confirm-delete"));
"quick/delete/$item->id?page_type=$page_type&from_id=$from_id", "",
"post", array("id" => "g-confirm-delete"));
$group = $form->group("confirm_delete")->label(t("Confirm Deletion"));
$group->submit("")->value(t("Delete"));
$form->script("")