X-Git-Url: http://git.roojs.org/?p=Pman.Core;a=blobdiff_plain;f=DataObjects%2FCore_group.php;h=a038c31b4ef15594d5df23d970abda694a9c5dfa;hp=3505fcebdc7549264664b13fb370aca988e80cc3;hb=74b743bbf342c300a4e48d0264f280d90ab05d49;hpb=66cba3dee5cec3edbab912d4627854980ce17bae

diff --git a/DataObjects/Core_group.php b/DataObjects/Core_group.php
index 3505fceb..a038c31b 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,34 +54,41 @@ class Pman_Core_DataObjects_Core_group extends DB_DataObject
                 $roo->jok($core_group->memberCount());
             }
         }
-
-        DB_DataObject::debugLevel(1);
-        $core_group = DB_DataObject::factory('core_group');
-        $cgmDBObj = DB_DataObject::Factory('core_group_member');
-        $cpObj = DB_DataObject::Factory('core_person');
+        
+        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_id
+                    ");
+        }
+        
+        
+        $cp = DB_DataObject::Factory('core_person')->tableName();
         $cgm = DB_DataObject::Factory('core_group_member')->tableName();
-        $cpObj->active = 1; // set the where condition with active = 1
-      
-        $cgm->joinAdd($cpObj, array('joinType' => 'LEFT', 'useWhereAsOn' => true));
-        $core_group->joinAdd($cgm, array('joinType' => 'LEFT', 'useWhereAsOn' => true));
-        $core_group->find();
-        DB_DataObject::debugLevel();
-        /*$this->selectAdd("
+        
+        $this->selectAdd("
            (
-            SELECT 
-                count(user_id) 
-            FROM 
-                {$cgm}
-            WHERE 
-                {$this->tableName()}.id = {$cgm}.group_id
-            ) 
-            AS group_member_count            
-        ");*/
-     
-    
-        /*$cgmDBObj->joinAdd($cpObj);
-        $this->joinAdd($cgmDBObj);
-        DB_DataObject::debugLevel();*/
+            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            
+        ");
+        
     }
 
     function toEventString() {
@@ -313,11 +321,24 @@ class Pman_Core_DataObjects_Core_group extends DB_DataObject
 
         foreach($data as $gi) {
             $g = DB_DataObject::factory($this->tableName());
+            
+            $o = false;
+            
+            if($g->get('name', $gi['name'])){
+                $o = clone($g);
+            }
+            
+            $display_name = (isset($gi['display_name'])) ? $gi['display_name'] : '';
+            
+            unset($gi['display_name']);
+            
             $g->setFrom($gi);
-
-            if(!$g->find(true)){
-                $g->insert();
+            
+            if(empty($o) || empty($o->display_name)){
+                $g->display_name = $display_name;
             }
+            
+            (empty($o)) ? $g->insert() : $g->update($o);
 
             if(count($g->members()) || empty($gi['members'])){
                 continue;