X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=DataObjects%2FCore_group.php;h=613a77d07a69dedf225aab179d9e214e172ade47;hb=f5aa5d161bc0428db89f56aa318dbf03ddff22bc;hp=9932a4fa2797f9c1bc6c6a74b1589ad00436e2f6;hpb=2696d29cb79b292a73babf994a8da2a685ba928d;p=Pman.Core diff --git a/DataObjects/Core_group.php b/DataObjects/Core_group.php index 9932a4fa..613a77d0 100644 --- a/DataObjects/Core_group.php +++ b/DataObjects/Core_group.php @@ -57,14 +57,16 @@ class Pman_Core_DataObjects_Core_group extends DB_DataObject if(!empty($q['_is_in_group'])){ $this->selectAdd(" - COALESCE( - (SELECT id from core_group_member + COALESCE(( + SELECT + COUNT(id) + FROM + core_group_member WHERE user_id = {$q['_is_in_group']} AND group_id = {$this->tableName()}.id - LIMIT 1 - ),0) as group_membership_user_id + ), 0) AS is_in_group "); } @@ -103,7 +105,11 @@ class Pman_Core_DataObjects_Core_group extends DB_DataObject $roo->jerr("missing group id"); } - foreach(explode(',', $q['user_ids']) as $uid) { + + $user_ids = explode(',', $q['user_ids']); + + foreach($user_ids as $uid) { + switch($q['_action']) { case 'add': $g->addMember($uid,$roo); @@ -204,6 +210,7 @@ class Pman_Core_DataObjects_Core_group extends DB_DataObject $gm = DB_Dataobject::factory('core_group_member'); $gm->group_id = $this->id; $gm->user_id = is_object($person) ? $person->id : $person; + if (!$gm->count()) { $gm->insert(); }