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

diff --git a/DataObjects/Core_group.php b/DataObjects/Core_group.php
index 33f15394..862cad86 100644
--- a/DataObjects/Core_group.php
+++ b/DataObjects/Core_group.php
@@ -55,21 +55,6 @@ class Pman_Core_DataObjects_Core_group extends DB_DataObject
             }
         }
         
-        if(!empty($q['_with_membership_user'])){
-            $q['_with_membership_user'] = 1*$q['_with_membership_user'];
-            $this->selectAdd("
-                COALESCE(
-                    (SELECT id from core_group_member
-                        WHERE 
-                            user_id = {$q['_with_membership_user']}
-                        AND
-                            group_id = {$this->tableName()}.id
-                        LIMIT 1
-                    ),0) as group_member_user
-                    ");
-        }
-        
-        
         $cp = DB_DataObject::Factory('core_person')->tableName();
         $cgm = DB_DataObject::Factory('core_group_member')->tableName();
         
@@ -89,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() {
@@ -337,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;