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

1) Add rearrange processing as a task

Browse Source 
2) Improved drop location determination
3) Add a revert if dropped on an invalid target
4) Add a popup dialog to display ajax errors
Still to do progress bar, pause/continue and status messages
This commit is contained in:
Tim Almdal
2009-04-20 18:44:19 +00:00
parent e8d99f22a1
commit ad10584dc1
6 changed files with 206 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

58
modules/organize/controllers/organize.php
View File

@@ -83,4 +83,62 @@ class Organize_Controller extends Controller {
}
return $v->__toString();
}
function rearrangeStart($id) {
access::verify_csrf();
$items = $this->input->post("item");
$task_def = Task_Definition::factory()
->callback("organize_task::rearrange")
->description(t("Rearrange the order of albums and photos"))
->name(t("Rearrange"));
$task = task::create($task_def, array("items" => $items, "position" => 0, "batch" =>
ceil(count($items) * .1)));
batch::start();
print json_encode(array("result" => "started",
"task" => array(
"id" => $task->id,
"percent_complete" => $task->percent_complete,
"status" => $task->status,
"done" => $task->done)));
}
function rearrangeRun($id, $task_id) {
access::verify_csrf();
$task = task::run($task_id);
print json_encode(array("result" => $task->done ? $task->state : "in_progress",
"task" => array(
"id" => $task->id,
"percent_complete" => $task->percent_complete,
"status" => $task->status,
"done" => $task->done)));
}
function rearrangeFinish($id, $task_id) {
access::verify_csrf();
$task = ORM::factory("task", $task_id);
if (!$task->done) {
message::warning(t("Rearrange album was was cancelled prior to completion"));
} else {
// @todo set the sort order to weight;
}
batch::stop();
print json_encode(array("result" => "success"));
}
function rearrangePause($id, $task_id) {
access::verify_csrf();
$task = ORM::factory("task", $task_id);
message::warning(t("Rearrange album was cancelled prior to completion"));
batch::stop();
print json_encode(array("result" => "success"));
}
}