stian/gallery3
1
0
Fork 0
mirror of https://github.com/Pathduck/gallery3.git synced 2026-05-20 03:19:13 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix for ticket #1181. Use $.getJSON to retrieve the json contents of the dialog. Convert all the controllers

Browse Source 
that create the data to go into a dialog to return the html as part of a json object.
This commit is contained in:
Tim Almdal
2010-07-06 14:12:00 -07:00
parent 9d66783f47
commit dbf3199e46
23 changed files with 62 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
modules/gallery/controllers/quick.php
View File

@@ -90,17 +90,10 @@ class Quick_Controller extends Controller {
access::required("view", $item);
access::required("edit", $item);
if ($item->is_album()) {
print t(
"Delete the album <b>%title</b>? All photos and movies in the album will also be deleted.",
array("title" => html::purify($item->title)));
} else {
print t("Are you sure you want to delete <b>%title</b>?",
array("title" => html::purify($item->title)));
}
$form = item::get_delete_form($item);
print $form;
$v = new View("quick_delete_confirm.html");
$v->item = $item;
$v->form = item::get_delete_form($item);
print json_encode(array("form" => (string) $v));
}
public function delete($id) {
@@ -149,6 +142,6 @@ class Quick_Controller extends Controller {
// Pass on the source item where this form was generated, so we have an idea where to return to.
$form->hidden("from_id")->value((int)Input::instance()->get("from_id", 0));
print $form;
print json_encode(array("form" => (string) $form));
}
}