X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=DataObjects%2FCore_group.php;h=d34ac9b0a026246959978588bf90effb04b4e701;hb=9d267840ff7efc96b0022d443c137643e9fd792e;hp=1fb155bcd0f3aa002cae335b092accac8eb66e02;hpb=06a431683c99f7ca5491107976b32d7c5ca0fda3;p=Pman.Core

diff --git a/DataObjects/Core_group.php b/DataObjects/Core_group.php
index 1fb155bc..d34ac9b0 100644
--- a/DataObjects/Core_group.php
+++ b/DataObjects/Core_group.php
@@ -50,10 +50,35 @@ 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("
+           (
+            SELECT 
+                count(user_id) 
+            FROM 
+                {$cgm}
+            WHERE 
+                {$this->tableName()}.id = {$cgm}.group_id
+            ) 
+            AS group_member_count            
+        ");
+        
+        $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
+        ";
+        
+
     }
 
     function toEventString() {
@@ -139,6 +164,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();
     }
 
@@ -146,6 +174,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');
 
     }
@@ -159,8 +189,8 @@ class Pman_Core_DataObjects_Core_group extends DB_DataObject
 
     function addMember($person,$roo = false)
     {
-        if ($this->name != "Empty Group") {
-            $roo->jerr('Cannot the person into the empty group');
+        if ($this->name == "Empty Group") {
+            $roo->jerr('Cannot add the person into Empty Group');
         }
         $gm = DB_Dataobject::factory('core_group_member');
         $gm->group_id = $this->id;
@@ -199,8 +229,6 @@ class Pman_Core_DataObjects_Core_group extends DB_DataObject
         // groups databse is hard coded to person.. so this should not be used for other tables.????
         $p = DB_Dataobject::factory( 'core_person' );
 
-
-
         $p->whereAdd('id IN ('. implode(',', $ids) .')');
         $p->active = 1;
 
@@ -253,7 +281,7 @@ class Pman_Core_DataObjects_Core_group extends DB_DataObject
 
     function initGroups()
     {
-
+        
         $g = DB_DataObject::factory($this->tableName());
         $g->type = 0;
         $g->name = 'Administrators';