X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=DataObjects%2FCore_group.php;h=c0f02eedaec7d046f7afbd1ccaa99f35493f44a5;hb=b897f6e026f9a01e3bfc217842e3b6ef1ab67d48;hp=6658918f88d90ae1832b1d9ab6a830a9b49322f9;hpb=13120ff1aa74ff1b2ef17bb6569fc6bc20417cb5;p=Pman.Core

diff --git a/DataObjects/Core_group.php b/DataObjects/Core_group.php
index 6658918f..c0f02eed 100644
--- a/DataObjects/Core_group.php
+++ b/DataObjects/Core_group.php
@@ -40,6 +40,7 @@ class Pman_Core_DataObjects_Core_group extends DB_DataObject
     // group types??
     function applyFilters($q, $au, $roo)
     {
+
         if (!empty($q['query']['name_starts'])) {
             $v = $this->escape($q['query']['name_starts']);
             $this->whereAdd("{$this->tableName()}.name like '{$v}%'");
@@ -53,28 +54,52 @@ class Pman_Core_DataObjects_Core_group extends DB_DataObject
                 $roo->jok($core_group->memberCount());
             }
         }
-
-
         
-        $cp = DB_DataObject::Factory('core_person');
-        $cgm = DB_DataObject::Factory('core_group_member');
+        if(!empty($q['_with_membership_user'])){
+            $q['_with_membership_user'] = 1*$q['_with_membership_user'];
+            $this->selectAdd("
+                COALESCE(
+                    (SELECT id from core_group_member
+                        WHERE 
+                            user_id = {$q['_with_membership_user']}
+                        AND
+                            group_id = {$this->tableName()}.id
+                        LIMIT 1
+                    ),0) as group_membership_user
+                    ");
+        }
+        
+        
+        $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}.group_id
-            
-            AND
-                {$cp}.active = 1
-            ) 
-            AS group_member_count            
+            SELECT COUNT(${cgm}.user_id) 
+                FROM 
+                    {$cgm}
+                LEFT JOIN
+                    {$cp}
+                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);