From 775987dff99b4459d6fef255d67da3bd6cdeb7c5 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Sat, 29 Aug 2009 11:29:38 -0700
Subject: Fix a bug where organize doesn't properly generate the tree at the
 root album.

---
 modules/organize/controllers/organize.php     | 7 +++++++
 modules/organize/views/organize_tree.html.php | 4 +---
 2 files changed, 8 insertions(+), 3 deletions(-)

(limited to 'modules')

diff --git a/modules/organize/controllers/organize.php b/modules/organize/controllers/organize.php
index de53c4ed..2b966657 100644
--- a/modules/organize/controllers/organize.php
+++ b/modules/organize/controllers/organize.php
@@ -136,6 +136,13 @@ class Organize_Controller extends Controller {
     $v = new View("organize_tree.html");
     $v->parents = $album->parents();
     $v->album = $album;
+
+    if ($album->id == 1) {
+      $v->peers = array($album);
+    } else {
+      $v->peers = $album->parent()->children(null, 0, array("type" => "album"));
+    }
+
     return $v;
   }
 }
diff --git a/modules/organize/views/organize_tree.html.php b/modules/organize/views/organize_tree.html.php
index cf957fe6..36f900ac 100644
--- a/modules/organize/views/organize_tree.html.php
+++ b/modules/organize/views/organize_tree.html.php
@@ -10,8 +10,7 @@
   <ul class="ui-icon-plus">
     <? endforeach ?>
 
-    <? if ($parent->id == $album->parent_id): ?>
-    <? foreach ($parent->children(null, 0, array("type" => "album")) as $peer): ?>
+    <? foreach ($peers as $peer): ?>
     <li class="gOrganizeAlbum ui-icon-left <?= access::can("edit", $peer) ? "" : "gViewOnly" ?>"
         ref="<?= $peer->id ?>">
       <span class="ui-icon <?= $peer->id == $album->id ? "ui-icon-minus" : "ui-icon-plus" ?>">
@@ -38,7 +37,6 @@
       <? endif ?>
     </li>
     <? endforeach ?>
-    <? endif ?>
 
     <? foreach ($parents as $parent): ?>
   </ul>
-- 
cgit v1.2.3