COmanage Developers List

Author: marie
Date: 2012-02-10 20:18:16 -0500 (Fri, 10 Feb 2012)
New Revision: 220

Modified:
   registry/trunk/app/Model/Cou.php
Log:
co-240 fix

Modified: registry/trunk/app/Model/Cou.php
===================================================================
--- registry/trunk/app/Model/Cou.php    2012-02-10 01:35:38 UTC (rev 219)
+++ registry/trunk/app/Model/Cou.php    2012-02-11 01:18:16 UTC (rev 220)
@@ -86,8 +86,8 @@
     )
   );
 
-// XXX tree behavior appears to be throwing database errors on add
-//  public $actsAs = array('Tree');
+  // XXX tree behavior appears to be throwing database errors on add (See 
CO-230)
+  public $actsAs = array('Tree');
 
   /**
    * Generates dropdown option list for html for a COU.
@@ -185,6 +185,10 @@
     $childrenArrays = $this->children($couBranch, false, 'id');
     $childrenList = Set::extract($childrenArrays, '{n}.Cou.id');
 
-    return(array_search($couNode, $childrenList));
+    // Check for NULL to avoid warning/error from array_search (See CO-240)
+    if($childrenList == NULL)
+      return false;
+    else
+      return(array_search($couNode, $childrenList));
   }
 }