COmanage Developers List

Author: marie
Date: 2012-02-20 18:53:35 -0500 (Mon, 20 Feb 2012)
New Revision: 232

Modified:
   registry/trunk/app/Controller/AppController.php
   registry/trunk/app/Model/Cou.php
Log:
co-233

Modified: registry/trunk/app/Controller/AppController.php
===================================================================
--- registry/trunk/app/Controller/AppController.php     2012-02-18 16:49:01 
UTC (rev 231)
+++ registry/trunk/app/Controller/AppController.php     2012-02-20 23:53:35 
UTC (rev 232)
@@ -227,7 +227,8 @@
             $this->loadModel('Cou');
 
             $ret['couadmin'] = $this->Cou->childCous($ret['couadmin']);
-            sort($ret['couadmin']);
+            if($ret['couadmin'] != NULL)
+              sort($ret['couadmin']);
 
             // Promote the set of COUs so they are globally available
             $this->cur_cous =   $ret['couadmin'];

Modified: registry/trunk/app/Model/Cou.php
===================================================================
--- registry/trunk/app/Model/Cou.php    2012-02-18 16:49:01 UTC (rev 231)
+++ registry/trunk/app/Model/Cou.php    2012-02-20 23:53:35 UTC (rev 232)
@@ -148,7 +148,9 @@
     {
       foreach($parentData as $parent)
       {
-        $allChildren = array_merge($allChildren, $this->children($parent, 
false, 'name'));
+        $thisChildren = $this->children($parent, false, 'name');
+        if($thisChildren != NULL)
+          $allChildren = array_merge($allChildren, $thisChildren);
       }
     }
     $allChildren = Set::extract($allChildren, '{n}.Cou.name');