X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=DataObjects%2FCore_group.php;h=39da3c0dc0b44f0d7e220803829db89771a771e3;hb=d9d74f47593ece237c49b513c1e503fbdb973be6;hp=da789118dad5856c85e16359714945bbf218b0c4;hpb=77304d8fc81adad4dbbc83720de102e35f8e2aca;p=Pman.Core

diff --git a/DataObjects/Core_group.php b/DataObjects/Core_group.php
index da789118..39da3c0d 100644
--- a/DataObjects/Core_group.php
+++ b/DataObjects/Core_group.php
@@ -50,10 +50,37 @@ 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());
             }
         }
+
+
         
+        $cp = DB_DataObject::Factory('core_person')->tableName();
+        $cgm = DB_DataObject::Factory('core_group_member')->tableName();
+        
+        $this->selectAdd("
+           (
+            SELECT 
+                count(user_id) 
+            FROM 
+                {$cgm}
+            WHERE 
+                {$this->tableName()}.id = {$cgm->tableName()}.group_id
+            AND
+                {$cgm->tableName()}.user_id = {$cp->tableName()}.id
+            AND
+                {$cp->tableName()}.active = 1
+            ) 
+            AS group_member_count            
+        ");
+ 
+
+     
+    
+        /*$cgmDBObj->joinAdd($cpObj);
+        $this->joinAdd($cgmDBObj);
+        DB_DataObject::debugLevel();*/
     }
 
     function toEventString() {
@@ -72,7 +99,7 @@ class Pman_Core_DataObjects_Core_group extends DB_DataObject
              foreach(explode(',', $q['user_ids']) as $uid) {
                 switch($q['_action']) {
                     case 'add':
-                        $g->addMember($uid);
+                        $g->addMember($uid,$roo);
                         break;
                     case 'sub':
                         $g->removeMember($uid);
@@ -139,6 +166,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 +176,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');
 
     }
@@ -157,10 +189,10 @@ class Pman_Core_DataObjects_Core_group extends DB_DataObject
         return $gm->count();
     }
 
-    function addMember($person,$roo)
+    function addMember($person,$roo = false)
     {
-        if ($this->name != "Empty Group") {
-            //$this->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 +231,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 +283,7 @@ class Pman_Core_DataObjects_Core_group extends DB_DataObject
 
     function initGroups()
     {
-
+        
         $g = DB_DataObject::factory($this->tableName());
         $g->type = 0;
         $g->name = 'Administrators';