stian/gallery3
1
0
Fork 0
mirror of https://github.com/Pathduck/gallery3.git synced 2026-07-10 17:29:18 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

Dragging from the thumbgrid to an album in the tree now works.

Browse Source 
Refactored the javascript to minimize duplication.
This commit is contained in:
Tim Almdal
2009-04-22 16:09:57 +00:00
parent f9ec5d6de4
commit 475b8fe9ff
6 changed files with 223 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
modules/organize/helpers/organize_task.php
View File

@@ -27,7 +27,7 @@ class organize_task_Core {
$context = unserialize($task->context);
try {
$stop = $context["position"] + $context["batch"];
$stop = min(count($context["items"]), $context["position"] + $context["batch"]);
for (; $context["position"] < $stop; $context["position"]++ ) {
$id = $context["items"][$context["position"]];
Database::instance()
@@ -35,12 +35,37 @@ class organize_task_Core {
}
$task->state = "success";
} catch(Exception $e) {
$tast->status = $e->getMessage();
$task->status = $e->getMessage();
$task->state = "error";
$task->save();
throw $e;
}
$task->context = serialize($context);
$total = count($context["items"]);
$task->percent_complete = $context["position"] / (float)$total * 100;
$task->done = $context["position"] == $total;
$task->done = $context["position"] == $total || $task->state == "error";
}
static function move($task) {
$context = unserialize($task->context);
try {
$target = ORM::factory("item", $context["target"]);
$stop = min(count($context["items"]), $context["position"] + $context["batch"]);
for (; $context["position"] < $stop; $context["position"]++ ) {
$source = ORM::factory("item", $context["items"][$context["position"]]);
core::move_item($source, $target);
}
$task->state = "success";
} catch(Exception $e) {
$task->status = $e->getMessage();
$task->state = "error";
$task->save();
throw $e;
}
$task->context = serialize($context);
$total = count($context["items"]);
$task->percent_complete = $context["position"] / (float)$total * 100;
$task->done = $context["position"] == $total || $task->state == "error";
}
}