stian/gallery3
1
0
Fork 0
mirror of https://github.com/Pathduck/gallery3.git synced 2026-06-01 09:19:09 -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

6
modules/gallery/controllers/admin_maintenance.php
View File

@@ -64,7 +64,7 @@ class Admin_Maintenance_Controller extends Admin_Controller {
log::info("tasks", t("Task %task_name started (task id %task_id)",
array("task_name" => $task->name, "task_id" => $task->id)),
html::anchor("admin/maintenance", t("maintenance")));
print $view;
print json_encode(array("form" => (string) $view));
}
/**
@@ -86,7 +86,7 @@ class Admin_Maintenance_Controller extends Admin_Controller {
log::info("tasks", t("Task %task_name resumed (task id %task_id)",
array("task_name" => $task->name, "task_id" => $task->id)),
html::anchor("admin/maintenance", t("maintenance")));
print $view;
print json_encode(array("form" => (string) $view));
}
/**
@@ -103,7 +103,7 @@ class Admin_Maintenance_Controller extends Admin_Controller {
$view = new View("admin_maintenance_show_log.html");
$view->task = $task;
print $view;
print json_encode(array("form" => (string) $view));
}
/**