DataObjects/Core_group.php

[Pman.Core] / DataObjects / Core_group.php

diff --git a/DataObjects/Core_group.php b/DataObjects/Core_group.php
index 5db1a5b..9ac4757 100644 (file)
--- a/DataObjects/Core_group.php
+++ b/DataObjects/Core_group.php
@@ -50,12 +50,12 @@ 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();;
         
-         $this->selectAdd("
+         /*$this->selectAdd("
            (
             SELECT 
                 count(user_id) 
@@ -65,7 +65,30 @@ class Pman_Core_DataObjects_Core_group extends DB_DataObject
                 {$this->tableName()}.id = {$cgm}.group_id
             ) 
             AS group_member_count            
+        ");*/
+        $this->selectAdd("
+           (
+            SELECT 
+                count(user_id) 
+            FROM 
+                {$cgm}
+            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
+            WHERE 
+                {$this->tableName()}.id = {$cgm}.group_id
+            AND
+                core_person.active = 1
+
+            ) 
+            AS group_member_count            
         ");
+
     }
 
     function toEventString() {
@@ -151,6 +174,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 +184,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,8 +291,7 @@ class Pman_Core_DataObjects_Core_group extends DB_DataObject
 
     function initGroups()
     {
-        print_r($this);
-        var_dump($this->tableName()));
+        
         $g = DB_DataObject::factory($this->tableName());
         $g->type = 0;
         $g->name = 'Administrators';