X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=DataObjects%2FCore_group.php;h=862cad8618bd23a6889a9a3efb2e3122c5a0c046;hb=c648e6c14165a86ae9916f7bcb61b0407d07999a;hp=178157f2530076f9fd97886e1773c02e79124643;hpb=5c8beafa12e04b58af62fb355de88a162c2755f6;p=Pman.Core

diff --git a/DataObjects/Core_group.php b/DataObjects/Core_group.php
index 178157f2..862cad86 100644
--- a/DataObjects/Core_group.php
+++ b/DataObjects/Core_group.php
@@ -40,6 +40,7 @@ class Pman_Core_DataObjects_Core_group extends DB_DataObject
     // group types??
     function applyFilters($q, $au, $roo)
     {
+
         if (!empty($q['query']['name_starts'])) {
             $v = $this->escape($q['query']['name_starts']);
             $this->whereAdd("{$this->tableName()}.name like '{$v}%'");
@@ -53,18 +54,6 @@ class Pman_Core_DataObjects_Core_group extends DB_DataObject
                 $roo->jok($core_group->memberCount());
             }
         }
-        print_r($q);
-        /*if(!empty($q['_with_member_id'])){
-            $this->selectAdd("
-                COALESE(
-                    (SELECT id from core_group_member
-                        WHERE ...
-                        
-                        LIMIT 1
-                    ),0) as ....
-                    ");
-        }*/
-        
         
         $cp = DB_DataObject::Factory('core_person')->tableName();
         $cgm = DB_DataObject::Factory('core_group_member')->tableName();
@@ -85,22 +74,6 @@ class Pman_Core_DataObjects_Core_group extends DB_DataObject
                 ) AS group_member_count            
         ");
         
-        /*WHERE 
-            {$this->tableName()}.id = core_group_member.group_id
-            AND
-                core_group_member.user_id = core_person.id
-            AND
-                core_person.active = 1    
-        )*/ 
-        
-//        $this->whereAdd("{$this->tableName()}.id = core_group_member.group_id");
-//        $this->whereAdd("core_group_member.user_id = core_person.id");
-//        $this->whereAdd("core_person.active = 1");
-     
-    
-        /*$cgmDBObj->joinAdd($cpObj);
-        $this->joinAdd($cgmDBObj);
-        DB_DataObject::debugLevel();*/
     }
 
     function toEventString() {
@@ -333,11 +306,24 @@ class Pman_Core_DataObjects_Core_group extends DB_DataObject
 
         foreach($data as $gi) {
             $g = DB_DataObject::factory($this->tableName());
+            
+            $o = false;
+            
+            if($g->get('name', $gi['name'])){
+                $o = clone($g);
+            }
+            
+            $display_name = (isset($gi['display_name'])) ? $gi['display_name'] : '';
+            
+            unset($gi['display_name']);
+            
             $g->setFrom($gi);
-
-            if(!$g->find(true)){
-                $g->insert();
+            
+            if(empty($o) || empty($o->display_name)){
+                $g->display_name = $display_name;
             }
+            
+            (empty($o)) ? $g->insert() : $g->update($o);
 
             if(count($g->members()) || empty($gi['members'])){
                 continue;