projects
/
Pman.Core
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix #8131 - chinese translations
[Pman.Core]
/
DataObjects
/
Core_group.php
diff --git
a/DataObjects/Core_group.php
b/DataObjects/Core_group.php
index
4ba05e2
..
54f83f5
100644
(file)
--- a/
DataObjects/Core_group.php
+++ b/
DataObjects/Core_group.php
@@
-45,6
+45,10
@@
class Pman_Core_DataObjects_Core_group extends DB_DataObject
$v = $this->escape($q['query']['name_starts']);
$this->whereAdd("{$this->tableName()}.name like '{$v}%'");
}
$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'])){
if(!empty($q['_count_member_by_name'])){
@@
-55,31
+59,42
@@
class Pman_Core_DataObjects_Core_group extends DB_DataObject
}
}
}
}
+ if(!empty($q['_is_in_group'])){
+ $this->selectAdd("
+ COALESCE((
+ SELECT
+ COUNT(id)
+ FROM
+ core_group_member
+ WHERE
+ user_id = {$q['_is_in_group']}
+ AND
+ group_id = {$this->tableName()}.id
+ ), 0) AS is_in_group
+ ");
+ }
+
+
$cp = DB_DataObject::Factory('core_person')->tableName();
$cgm = DB_DataObject::Factory('core_group_member')->tableName();
$this->selectAdd("
(
$cp = DB_DataObject::Factory('core_person')->tableName();
$cgm = DB_DataObject::Factory('core_group_member')->tableName();
$this->selectAdd("
(
- SELECT COUNT(
${
cgm}.user_id)
+ SELECT COUNT(
{$
cgm}.user_id)
FROM
{$cgm}
LEFT JOIN
{$cp}
ON
FROM
{$cgm}
LEFT JOIN
{$cp}
ON
-
${
cp}.id = {$cgm}.user_id
+
{$
cp}.id = {$cgm}.user_id
WHERE
WHERE
-
${
cgm}.group_id = {$this->tableName()}.id
+
{$
cgm}.group_id = {$this->tableName()}.id
AND
AND
-
${
cp}.active = 1
+
{$
cp}.active = 1
) AS group_member_count
");
}
) AS group_member_count
");
}
-
- function postListExtra($q)
- {
-
- }
function toEventString() {
return $this->name;
function toEventString() {
return $this->name;
@@
-94,13
+109,18
@@
class Pman_Core_DataObjects_Core_group extends DB_DataObject
$roo->jerr("missing group id");
}
$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);
break;
case 'sub':
switch($q['_action']) {
case 'add':
$g->addMember($uid,$roo);
break;
case 'sub':
- $g->removeMember($uid);
+
+ $g->removeMember($uid, $roo);
break;
default:
$roo->jerr('invalid action');
break;
default:
$roo->jerr('invalid action');
@@
-109,8
+129,18
@@
class Pman_Core_DataObjects_Core_group extends DB_DataObject
$roo->jok('updated');
}
$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()
function beforeDelete()
@@
-195,17
+225,22
@@
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;
$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();
}
}
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;
{
$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();
}
if ($gm->find(true)) {
$gm->delete();
}