X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=DataObjects%2FCore_group.php;h=613a77d07a69dedf225aab179d9e214e172ade47;hb=f61e0023b975638a8a1c239decbdcc45e87f192d;hp=c2a559a95cf09c96ebadedefa27dfa096fc68e9c;hpb=7c054a4d976a431b6b47333f74a07e15936db5d9;p=Pman.Core

diff --git a/DataObjects/Core_group.php b/DataObjects/Core_group.php
index c2a559a9..613a77d0 100644
--- a/DataObjects/Core_group.php
+++ b/DataObjects/Core_group.php
@@ -55,17 +55,19 @@ class Pman_Core_DataObjects_Core_group extends DB_DataObject
             }
         }
         
-        if(!empty($q['mem_id'])){
+        if(!empty($q['_is_in_group'])){
             $this->selectAdd("
-                COALESCE(
-                    (SELECT id from core_group_member
+                COALESCE((
+                    SELECT 
+                            COUNT(id) 
+                    FROM 
+                            core_group_member
                         WHERE 
-                            user_id = {$q['mem_id']}
+                            user_id = {$q['_is_in_group']}
                         AND
                             group_id = {$this->tableName()}.id
-                        LIMIT 1
-                    ),0) as cgm_id
-                    ");
+                    ), 0) AS is_in_group
+            ");
         }
         
         
@@ -88,22 +90,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() {
@@ -119,7 +105,11 @@ class Pman_Core_DataObjects_Core_group extends DB_DataObject
                 $roo->jerr("missing group id");
 
             }
-             foreach(explode(',', $q['user_ids']) as $uid) {
+            
+            $user_ids = explode(',', $q['user_ids']);
+            
+            foreach($user_ids as $uid) {
+                
                 switch($q['_action']) {
                     case 'add':
                         $g->addMember($uid,$roo);
@@ -220,6 +210,7 @@ class Pman_Core_DataObjects_Core_group extends DB_DataObject
         $gm = DB_Dataobject::factory('core_group_member');
         $gm->group_id = $this->id;
         $gm->user_id = is_object($person) ? $person->id : $person;
+        
         if (!$gm->count()) {
             $gm->insert();
         }
@@ -336,11 +327,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;