$v = $this->escape($q['query']['name_starts']);
$this->whereAdd("{$this->tableName()}.name like '{$v}%'");
}
+ if (!empty($q['query']['name_contains'])) {
+ $v = $this->escape($q['query']['name_contains']);
+ $this->whereAdd("{$this->tableName()}.name like '%{$v}%'");
+ }
if(!empty($q['_count_member_by_name'])){
$this->selectAdd("
(
- SELECT COUNT(${cgm}.user_id)
+ SELECT COUNT({$cgm}.user_id)
FROM
{$cgm}
LEFT JOIN
{$cp}
ON
- ${cp}.id = {$cgm}.user_id
+ {$cp}.id = {$cgm}.user_id
WHERE
- ${cgm}.group_id = {$this->tableName()}.id
+ {$cgm}.group_id = {$this->tableName()}.id
AND
- ${cp}.active = 1
+ {$cp}.active = 1
) AS group_member_count
");
$g->addMember($uid,$roo);
break;
case 'sub':
- $g->removeMember($uid);
+
+ $g->removeMember($uid, $roo);
break;
default:
$roo->jerr('invalid action');
$roo->jok('updated');
}
+ if (isset($q['display_name']) && !isset($q['name']) && !$this->is_system) {
+ $this->name = $q['display_name'];
+ }
}
+
+ function beforeUpdate($old, $q,$roo)
+ {
+ if (isset($q['display_name']) && empty($q['name']) && !$this->is_system) {
+ $this->name = $q['display_name'];
+ }
+ }
function beforeDelete()
$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();
}
}
- function removeMember($person)
+ function removeMember($person, $roo)
{
$gm = DB_Dataobject::factory('core_group_member');
$gm->group_id = $this->id;
$gm->user_id = is_object($person) ? $person->id : $person;
-
+ $au = $roo->getAuthUser();
+ if ($gm->group()->name == 'Administrators' && $gm->user_id = $au->id) {
+ $roo->jerr("You can not remove yourself from the admin group");
+ }
+
if ($gm->find(true)) {
$gm->delete();
}