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

diff --git a/DataObjects/Core_group.php b/DataObjects/Core_group.php
index 30831517..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();
         
@@ -89,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);
@@ -190,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();
         }
@@ -264,21 +285,13 @@ class Pman_Core_DataObjects_Core_group extends DB_DataObject
 
     function postListFilter($ar, $au, $req)
     {
-        $ret = array();
-        
-        if(!empty($req['_is_group'])){
-            
-            
-            
-        }
-            
-        if(!empty($req['_add_everyone'])){
-            $ret[] = array( 'id' => 0, 'name' => 'EVERYONE');
-            $ret[] = array( 'id' => -1, 'name' => 'NOT_IN_GROUP');
-            $ar = array_merge($ret, $ar);
+        if(empty($req['_add_everyone'])){
+            return $ar;
         }
-        
-        
+
+        $ret[] = array( 'id' => 0, 'name' => 'EVERYONE');
+        $ret[] = array( 'id' => -1, 'name' => 'NOT_IN_GROUP');
+        return array_merge($ret, $ar);
 
     }