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

remove the batch start/stop and replace the ORM update of the weight, with a direct sql update. This bypasses the gallery3 event mechanism. Fire a album_rearrange event when the rearrangement is complete

Browse Source
This commit is contained in:
Tim Almdal
2009-08-17 12:56:05 -07:00
parent 69d1b16818
commit 6f6d5b306b
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -173,9 +173,7 @@ class Organize_Controller extends Controller {
$weight = $task->get("weight");
$target_id = $task->get("target_id");
$is_before = $task->get("before") == "before";
if ($task->percent_complete == 0) {
batch::start();
}
// @todo at some point if we allow drag from album tree this needs to be changed
if ($phase == "dropping") {
$children = ORM::factory("item")
@@ -211,8 +209,9 @@ class Organize_Controller extends Controller {
$task->set("phase", "dropping");
break;
}
$child->weight = item::get_max_weight();
$child->save();
Database::instance()->query(
"UPDATE {items} SET `weight` = " . item::get_max_weight() .
" WHERE `id` = " . $child->id);
$completed++;
if ($phase == "before_drop" && $child->id == $task->get("target_id")) {
@@ -222,9 +221,10 @@ class Organize_Controller extends Controller {
}
}
if ($completed == $task->get("total")) {
$parent->sort_column = "weight";
$parent->save();
batch::stop();
Database::instance()->query(
"UPDATE {items} SET `sort_column` = \"weight\"" .
" WHERE `id` = " . $parent->id);
module::event("album_rearrange", $parent);
$task->done = true;
$task->state = "success";
$task->set("content", self::_get_micro_thumb_grid($parent, 0)->__toString());