X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=DataObjects%2FCore_group.php;h=a7feecde6b6c55dcfd1f8fd47118bc4e03bd3fa3;hb=49f4ce81e1816585d1ae52f75c649957d2bad761;hp=4e456f61ff3a5efc5939e48f644b9386b6e53845;hpb=71305fed4c552b0ae4716a7d01756a9ad81a1c3f;p=Pman.Core

diff --git a/DataObjects/Core_group.php b/DataObjects/Core_group.php
index 4e456f61..a7feecde 100644
--- a/DataObjects/Core_group.php
+++ b/DataObjects/Core_group.php
@@ -50,22 +50,36 @@ 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();;
+
+
+        
+        $cp = DB_DataObject::Factory('core_person')->tableName();
+        $cgm = DB_DataObject::Factory('core_group_member')->tableName();
         
-         $this->selectAdd("
+        $this->selectAdd("
            (
             SELECT 
                 count(user_id) 
             FROM 
-                {$cgm}
+                core_group_member
             WHERE 
-                {$this->tableName()}.id = {$cgm}.group_id
+                {$this->tableName()}.id = core_group_member.group_id
+                AND
+                    core_group_member.user_id = core_person.id
+                
             ) 
             AS group_member_count            
         ");
+ 
+
+     
+    
+        /*$cgmDBObj->joinAdd($cpObj);
+        $this->joinAdd($cgmDBObj);
+        DB_DataObject::debugLevel();*/
     }
 
     function toEventString() {
@@ -151,6 +165,9 @@ 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');
+        //PDO_DAtaObject::DebugLevel(1); 
         return $gm->count();
     }
 
@@ -158,6 +175,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');
 
     }
@@ -263,7 +282,7 @@ class Pman_Core_DataObjects_Core_group extends DB_DataObject
 
     function initGroups()
     {
-
+        
         $g = DB_DataObject::factory($this->tableName());
         $g->type = 0;
         $g->name = 'Administrators';