DataObjects/Core_domain.php

[Pman.Core] / DataObjects / Groups.php

diff --git a/DataObjects/Groups.php b/DataObjects/Groups.php
index 2e3d6bd..2efc94a 100755 (executable)
--- a/DataObjects/Groups.php
+++ b/DataObjects/Groups.php
@@ -160,21 +160,27 @@ class Pman_Core_DataObjects_Groups extends DB_DataObject
         $g->insert();
         $gr = DB_DataObject::factory('group_rights');
         $gr->genDefault();
-    
-        
     }
     
     function initDatabase($roo, $data)
     {
         $this->initGroups();
+        
         foreach($data as $gi) {
             $g = DB_DataObject::factory('Groups');
             $g->setFrom($gi);
-            if ($g->count()) {
+            
+            if(!$g->find(true)){
+                $g->insert();
+            }
+            
+            if(count($g->members()) || empty($gi['members'])){
                 continue;
             }
-            $g->insert();
             
+            foreach ($gi['members'] as $m){
+                $g->addMember($m);
+            }
             
         }