X-Git-Url: http://git.roojs.org/?p=Pman.Core;a=blobdiff_plain;f=DataObjects%2FCore_group.php;h=613a77d07a69dedf225aab179d9e214e172ade47;hp=48285a27d54b0b04f6595929f3c0fe9ef5a4d886;hb=bbbf9583c92462e5ba51a489fb0870981b602245;hpb=6cd6488eb10b7a38a7571ec633bce2820d5a5b17

diff --git a/DataObjects/Core_group.php b/DataObjects/Core_group.php
index 48285a27..613a77d0 100644
--- a/DataObjects/Core_group.php
+++ b/DataObjects/Core_group.php
@@ -55,6 +55,22 @@ class Pman_Core_DataObjects_Core_group extends DB_DataObject
             }
         }
         
+        if(!empty($q['_is_in_group'])){
+            $this->selectAdd("
+                COALESCE((
+                    SELECT 
+                            COUNT(id) 
+                    FROM 
+                            core_group_member
+                        WHERE 
+                            user_id = {$q['_is_in_group']}
+                        AND
+                            group_id = {$this->tableName()}.id
+                    ), 0) AS is_in_group
+            ");
+        }
+        
+        
         $cp = DB_DataObject::Factory('core_person')->tableName();
         $cgm = DB_DataObject::Factory('core_group_member')->tableName();
         
@@ -75,11 +91,6 @@ class Pman_Core_DataObjects_Core_group extends DB_DataObject
         ");
         
     }
-    
-    function toRooArray($q)
-    {
-        print_R($this);exit;
-    }
 
     function toEventString() {
         return $this->name;
@@ -94,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);
@@ -195,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();
         }