X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=DataObjects%2FCore_group.php;h=891912b234a9f057036b9a13c1866dcf13eae368;hb=ddba0e081f8b9d682480ef8e7f0afe5fdab008e7;hp=cfde03ae49af936b3a6d159140d11958ddcfd99e;hpb=4269ddc8e2c18db29b605b72141d7f35f44b2ccd;p=Pman.Core

diff --git a/DataObjects/Core_group.php b/DataObjects/Core_group.php
index cfde03ae..891912b2 100644
--- a/DataObjects/Core_group.php
+++ b/DataObjects/Core_group.php
@@ -50,12 +50,23 @@ class Pman_Core_DataObjects_Core_group extends DB_DataObject
             $core_group = DB_DataObject::factory('core_group');
             
             if($core_group->get('name', $q['_count_member_by_name'])){
-                $roo->jdata($core_group->memberCount());
+                $roo->jok($core_group->memberCount());
             }
         }
-        $cgm = DB_DataObject::Factory('core_group_member')->tableName();;
+        $cgm = DB_DataObject::Factory('core_group_member')->tableName();
         
-         $this->selectAdd("
+        $this->_join .= "
+            LEFT JOIN
+                core_group_member
+            ON
+                core_group.id = core_group_member.group_id
+            Left JOIN
+                core_person
+            ON
+                core_user_id = core_person.id
+        ";
+        
+        $this->selectAdd("
            (
             SELECT 
                 count(user_id) 
@@ -64,8 +75,14 @@ class Pman_Core_DataObjects_Core_group extends DB_DataObject
             WHERE 
                 {$this->tableName()}.id = {$cgm}.group_id
             ) 
+            AND
+                core_person.active = 1
             AS group_member_count            
         ");
+        
+        
+        
+
     }
 
     function toEventString() {
@@ -161,6 +178,8 @@ class Pman_Core_DataObjects_Core_group extends DB_DataObject
     {
         $gm = DB_Dataobject::factory('core_group_member');
         $gm->group_id = $this->id;
+        $gm->autoJoin();
+        $gm->whereAdd('join_user_id_id.active = 1');
         return $gm->fetchAll('user_id');
 
     }