mirror of
https://github.com/Pathduck/gallery3.git
synced 2026-04-12 17:05:31 -04:00
a432a43b3b
item::move(source, target) helper when the parent member has changed.
Using the move method insures that names and slugs that could conflict
in the target album are resolved properly. Changed the item::move
method so it returns a message to be displayed if the caller chooses.
And changed the move controller to display the message returned by the
move if the item name was renamed as part of the move."
Rolling this back for a couple of reasons:
1) Bug in move.php ("message.info" is not a function name)
2) Having the message come back from the API call as a side-effect is
sloppy. We should find a cleaner way to do this checking.
3) having item::move() call save() on any changed values in the ORM
is counter-intuitive. Move should move, save should save.
I think the right approach here is to roll the move() code properly into
save().
This reverts commit 2492280cc0.
74 lines
2.5 KiB
PHP
74 lines
2.5 KiB
PHP
<?php defined("SYSPATH") or die("No direct script access.");
|
|
/**
|
|
* Gallery - a web based photo album viewer and editor
|
|
* Copyright (C) 2000-2010 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 Move_Controller extends Controller {
|
|
public function browse($source_id) {
|
|
$source = ORM::factory("item", $source_id);
|
|
access::required("view", $source);
|
|
access::required("edit", $source);
|
|
|
|
$view = new View("move_browse.html");
|
|
$view->source = $source;
|
|
$view->tree = $this->_get_tree_html($source, ORM::factory("item", 1));
|
|
print $view;
|
|
}
|
|
|
|
public function save($source_id) {
|
|
access::verify_csrf();
|
|
$source = ORM::factory("item", $source_id);
|
|
$target = ORM::factory("item", Input::instance()->post("target_id"));
|
|
|
|
access::required("view", $source);
|
|
access::required("edit", $source);
|
|
access::required("view", $target);
|
|
access::required("edit", $target);
|
|
|
|
item::move($source, $target);
|
|
|
|
print json_encode(
|
|
array("result" => "success",
|
|
"location" => $target->url()));
|
|
}
|
|
|
|
public function show_sub_tree($source_id, $target_id) {
|
|
$source = ORM::factory("item", $source_id);
|
|
$target = ORM::factory("item", $target_id);
|
|
access::required("view", $source);
|
|
access::required("edit", $source);
|
|
access::required("view", $target);
|
|
// show targets even if they're not editable because they may contain children which *are*
|
|
// editable
|
|
|
|
print $this->_get_tree_html($source, $target);
|
|
}
|
|
|
|
private function _get_tree_html($source, $target) {
|
|
$view = new View("move_tree.html");
|
|
$view->source = $source;
|
|
$view->parent = $target;
|
|
$view->children = ORM::factory("item")
|
|
->viewable()
|
|
->where("type", "=", "album")
|
|
->where("parent_id", "=", $target->id)
|
|
->find_all();
|
|
return $view;
|
|
}
|
|
|
|
}
|