1) Add rearrange processing as a task

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

1 files changed, 51 insertions, 0 deletions

diff --git a/modules/organize/helpers/organize_task.php b/modules/organize/helpers/organize_task.php
new file mode 100644
index 00000000..8c73acde
--- /dev/null
+++ b/modules/organize/helpers/organize_task.php
@@ -0,0 +1,51 @@
+<?php defined("SYSPATH") or die("No direct script access.");
+/**
+ * Gallery - a web based photo album viewer and editor
+ * Copyright (C) 2000-2008 Bharat Mediratta
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or (at
+ * your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA  02110-1301, USA.
+ */
+class organize_task_Core {
+  static function available_tasks() {
+    // Return empty array so nothing appears in the maintenance screen
+    return array();
+  }
+
+  static function rearrange($task) {
+    $context = unserialize($task->context);
+
+    try {
+      $stop = $context["position"] + $context["batch"];
+      $sql = "";
+      for (; $context["position"] < $stop; $context["position"]++ ) {
+        $id = $context["items"][$context["position"]];
+        $sql .= "Update {items} set weight = {$context["position"]} where id=$id;";
+      }
+      if (!empty($sql)) {
+        Kohana::log("debug", $sql);
+        $db = Database::instance()->query($sql);
+        Kohana::log("debug", Kohana::debug($db));
+      }
+      $task->state = "success";
+    } catch(Exception $e) {
+      $tast->status = $e->getMessage();
+      $task->state = "error";
+    }
+    $task->context = serialize($context);
+    $total = count($context["items"]);
+    $task->percent_complete = $context["position"] / (float)$total * 100;
+    $task->done = $context["position"] == $total;
+  }
+}
\ No newline at end of file