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

Precalculate the organize tree based on the selected album and render

Browse Source 
it right away while still allowing incremental tree loading.
This commit is contained in:
Bharat Mediratta
2009-08-30 14:35:27 -07:00
parent fd954fe86e
commit d1ade6620e
2 changed files with 20 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/organize/controllers/organize.php
+12 -5
View File
@@ -25,7 +25,7 @@ class Organize_Controller extends Controller {
$v = new View("organize_dialog.html");
$v->album = $album;
$v->album_tree = self::_tree(ORM::factory("item", 1));
$v->album_tree = self::_expanded_tree(ORM::factory("item", 1), $album);
$v->micro_thumb_grid = self::_get_micro_thumb_grid($album, 0);
print $v;
}
@@ -50,7 +50,7 @@ class Organize_Controller extends Controller {
}
print json_encode(
array("tree" => self::_tree(ORM::factory("item", 1))->__toString(),
array("tree" => self::_expanded_tree(ORM::factory("item", 1), $album)->__toString(),
"grid" => self::_get_micro_thumb_grid($album, 0)->__toString()));
}
@@ -135,12 +135,19 @@ class Organize_Controller extends Controller {
public function tree($album_id) {
$album = ORM::factory("item", $album_id);
access::required("view", $album);
print self::_tree($album);
print self::_expanded_tree($album, $album);
}
private static function _tree($album) {
/**
* Create an HTML representation of the tree from the root down to the selected album. We only
* include albums along the descendant hierarchy that includes the selected album, and the
* immediate child albums.
*/
private static function _expanded_tree($root, $selected_album) {
$v = new View("organize_tree.html");
$v->album = $album;
$v->album = $root;
$v->selected = $selected_album;
return $v;
}
}