X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=DataObjects%2FCore_group.php;h=bbe969afc13158be243e86d89e2e329fd0f65095;hb=62becc114aa739d413c49bbd6d79259cb579fedf;hp=5cdf122731a1b71aeb2b46c1bb7363b785884260;hpb=65e768abc808806d993dc36796a2b58a7414b241;p=Pman.Core

diff --git a/DataObjects/Core_group.php b/DataObjects/Core_group.php
index 5cdf1227..bbe969af 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
-      
-        $cgm->joinAdd($cpObj, array('joinType' => 'LEFT', 'useWhereAsOn' => true), "user_id");
-        $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(core_group_member.user_id) 
+                FROM 
+                    core_group_member
+                LEFT JOIN
+                    core_person
+                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);