X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=DataObjects%2FCore_group.php;h=308315177d277d4586d4e90411373aaf44dda73f;hb=36da945910507821e43843e0e3950791c3b3d239;hp=7b2ccbebde9b633268a30a4ec0680d6335c7e5fe;hpb=264283ca1af3f74e473310c054401e7817d29beb;p=Pman.Core

diff --git a/DataObjects/Core_group.php b/DataObjects/Core_group.php
index 7b2ccbeb..30831517 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,42 +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(core_group_member.user_id) 
+            SELECT COUNT(${cgm}.user_id) 
                 FROM 
-                    core_group_member
+                    {$cgm}
                 LEFT JOIN
-                    core_person
+                    {$cp}
                 ON
-                    core_person.id = core_group_member.user_id
+                    ${cp}.id = {$cgm}.user_id
                 WHERE
-                    core_person.active = 1
-            ) AS group_member_count            
+                    ${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);
-        $this->joinAdd($cgmDBObj);
-        DB_DataObject::debugLevel();*/
     }
 
     function toEventString() {
@@ -279,13 +264,21 @@ class Pman_Core_DataObjects_Core_group extends DB_DataObject
 
     function postListFilter($ar, $au, $req)
     {
-        if(empty($req['_add_everyone'])){
-            return $ar;
+        $ret = array();
+        
+        if(!empty($req['_is_group'])){
+            
+            
+            
         }
-
-        $ret[] = array( 'id' => 0, 'name' => 'EVERYONE');
-        $ret[] = array( 'id' => -1, 'name' => 'NOT_IN_GROUP');
-        return array_merge($ret, $ar);
+            
+        if(!empty($req['_add_everyone'])){
+            $ret[] = array( 'id' => 0, 'name' => 'EVERYONE');
+            $ret[] = array( 'id' => -1, 'name' => 'NOT_IN_GROUP');
+            $ar = array_merge($ret, $ar);
+        }
+        
+        
 
     }
 
@@ -321,11 +314,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;