X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=DataObjects%2FCore_group.php;h=862cad8618bd23a6889a9a3efb2e3122c5a0c046;hb=c648e6c14165a86ae9916f7bcb61b0407d07999a;hp=80e388f52dc65b83a10f4f458bfe68f84750fc5c;hpb=eb717f44d077745e90ead9aa9b71e2c90720f81c;p=Pman.Core

diff --git a/DataObjects/Core_group.php b/DataObjects/Core_group.php
index 80e388f5..862cad86 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,31 +54,26 @@ class Pman_Core_DataObjects_Core_group extends DB_DataObject
                 $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 
-                core_group_member
-            WHERE 
-                {$this->tableName()}.id = core_group_member.group_id
-                
-            ) 
-            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            
         ");
- 
-
-     
-    
-        /*$cgmDBObj->joinAdd($cpObj);
-        $this->joinAdd($cgmDBObj);
-        DB_DataObject::debugLevel();*/
+        
     }
 
     function toEventString() {
@@ -310,11 +306,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;