X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=DataObjects%2FCore_group.php;h=a18c3da94a661b3b24e7127f94cd58a2f57c74ca;hb=e2f5b2ff1de0532f196c40a5edf6220220e5892a;hp=994f4b90a308f07ea8077090792c8b2b360fcd3b;hpb=eade174828270944bc66b781eef5e0961f358166;p=Pman.Core

diff --git a/DataObjects/Core_group.php b/DataObjects/Core_group.php
index 994f4b90..a18c3da9 100644
--- a/DataObjects/Core_group.php
+++ b/DataObjects/Core_group.php
@@ -54,28 +54,38 @@ class Pman_Core_DataObjects_Core_group extends DB_DataObject
             }
         }
 
-        DB_DataObject::debugLevel(1);
-        $core_group = DB_DataObject::factory('core_group');
-        $cgmDBObj = DB_DataObject::Factory('core_group_member');
-        $cpObj = DB_DataObject::Factory('core_person');
+
+        
+        $cp = DB_DataObject::Factory('core_person')->tableName();
         $cgm = DB_DataObject::Factory('core_group_member')->tableName();
-        $cpObj->active = 1; // set the where condition with active = 1
-      
-        $core_group->joinAdd($cgmDBObj, array('joinType' => 'LEFT', 'useWhereAsOn' => false));
-        $core_group->joinAdd($cpObj, array('joinType' => 'LEFT', 'useWhereAsOn' => true));
-        $core_group->find();
-        DB_DataObject::debugLevel();
-        /*$this->selectAdd("
+        
+        $this->selectAdd("
            (
-            SELECT 
-                count(user_id) 
-            FROM 
-                {$cgm}
-            WHERE 
-                {$this->tableName()}.id = {$cgm}.group_id
-            ) 
-            AS group_member_count            
-        ");*/
+            SELECT COUNT(${cgm}.user_id) 
+                FROM 
+                    {$cgm}
+                LEFT JOIN
+                    {$cp}
+                ON
+                    ${cp}.id = {$cgm}.user_id
+                WHERE
+                    ${cgm}.group_id = {$this->tableName()}.id
+                AND
+                    ${cp}.active = 1
+                ) 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);