Changeset 1818 for plugins/apostrophePlugin/branches/features/css/lib/model/doctrine/PluginaPage.class.php

Timestamp:

07/21/10 16:35:10 (22 months ago)

Author:

johnnyoffline

Message:

merged the latest changes in the trunk into my branch including any new CSS since revision 1717. The new CSS introduced was moved to the new locations in the split files. I am keeping this feature branch alive ladies and gents :)

Location:

plugins/apostrophePlugin/branches/features/css

Files:

• . (modified) (1 prop)
• lib/model/doctrine/PluginaPage.class.php (modified) (4 diffs)

plugins/apostrophePlugin/branches/features/css/lib/model/doctrine/PluginaPage.class.php

@@ -400 +400 @@
 
   // Careful, the cache must hold the entire path including the item itself, we lop off the last element
-        // before returning in those cases where it is not wanted.
-  public function getAncestorsInfo($includeSelf = false)
-  {
+        // before returning in those cases where it is not wanted. Note that $livingOnly does NOT change the 'level'
+        // field for each returned ancestor
+  public function getAncestorsInfo($includeSelf = false, $livingOnly = false)
+  {
+    // We cache the results of one simple query that gets the whole lineage, and permute that a little
+    // for the includeSelf and livingOnly cases
     if (!isset($this->ancestorsInfo))
     {
@@ -415 +418 @@
                         $ancestorsInfo = $this->ancestorsInfo;
                         array_pop($ancestorsInfo);
+                }
+                if ($livingOnly)
+                {
+                  $newAncestorsInfo = array();
+                  foreach ($ancestorsInfo as $ancestor)
+                  {
+                    if (!$ancestor['archived'])
+                    {
+                      $newAncestorsInfo[] = $ancestor;
+                    }
+                  }
+                  $ancestorsInfo = $newAncestorsInfo;
                 }
                 return $ancestorsInfo;
@@ -572 +587 @@
     // an accordion contro. in the first place
     $ancestors = $this->getAncestorsInfo();
-    
     // Dump ancestors we don't care about
     $found = false;
@@ -592 +606 @@
     foreach ($ancestors as $ancestor)
     {
+      if ($livingOnly && ($ancestor['archived']))
+      {
+        continue;
+      }
       $lineage[] = $ancestor['id'];
       if ($ancestor['level'] == 0)