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

Added progress bar and pause and continue functionality to rearrange

Browse Source
This commit is contained in:
Tim Almdal
2009-04-21 06:04:03 +00:00
parent 201e8cdf70
commit c94fc344e8
4 changed files with 39 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -21,7 +21,7 @@ class Organize_Controller extends Controller {
private static $_MICRO_THUMB_SIZE = 90;
private static $_MICRO_THUMB_PADDING = 5;
public function index($item_id=1) {
function index($item_id=1) {
$item = ORM::factory("item", $item_id);
$root = ($item->id == 1) ? $item : ORM::factory("item", 1);
@@ -36,7 +36,7 @@ class Organize_Controller extends Controller {
print $v;
}
public function content($item_id) {
function content($item_id) {
$item = ORM::factory("item", $item_id);
$width = $this->input->get("width");
$height = $this->input->get("height");
@@ -54,14 +54,14 @@ class Organize_Controller extends Controller {
"data" => $v->__toString()));
}
public function header($item_id) {
function header($item_id) {
$item = ORM::factory("item", $item_id);
print json_encode(array("title" => $item->title,
"description" => empty($item->description) ? "" : $item->description));
}
public function tree($item, $parent) {
function tree($item, $parent) {
$albums = ORM::factory("item")
->where(array("parent_id" => $parent->id, "type" => "album"))
->orderby(array("title" => "ASC"))
@@ -105,6 +105,7 @@ class Organize_Controller extends Controller {
}
function rearrangeRun($id, $task_id) {
Kohana::log("debug", "rearrangeRun($id, $task_id)");
access::verify_csrf();
$task = task::run($task_id);
@@ -118,14 +119,15 @@ class Organize_Controller extends Controller {
}
function rearrangeFinish($id, $task_id) {
Kohana::log("debug", "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;
if ($task->done) {
$item = ORM::factory("item", $id);
$item->sort_column = "weight";
$item->save();
}
batch::stop();