projects
/
Pman.Core
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
DataObjects/Core_group.php
[Pman.Core]
/
DataObjects
/
Core_group.php
diff --git
a/DataObjects/Core_group.php
b/DataObjects/Core_group.php
index
d6663fb
..
595d44e
100644
(file)
--- a/
DataObjects/Core_group.php
+++ b/
DataObjects/Core_group.php
@@
-50,10
+50,22
@@
class Pman_Core_DataObjects_Core_group extends DB_DataObject
$core_group = DB_DataObject::factory('core_group');
if($core_group->get('name', $q['_count_member_by_name'])){
$core_group = DB_DataObject::factory('core_group');
if($core_group->get('name', $q['_count_member_by_name'])){
- $roo->j
data
($core_group->memberCount());
+ $roo->j
ok
($core_group->memberCount());
}
}
}
}
+ $cgm = DB_DataObject::Factory('core_group_member')->tableName();;
+ $this->selectAdd("
+ (
+ SELECT
+ count(user_id)
+ FROM
+ {$cgm}
+ WHERE
+ {$this->tableName()}.id = {$cgm}.group_id
+ )
+ AS group_member_count
+ ");
}
function toEventString() {
}
function toEventString() {
@@
-139,6
+151,9
@@
class Pman_Core_DataObjects_Core_group extends DB_DataObject
{
$gm = DB_Dataobject::factory('core_group_member');
$gm->group_id = $this->id;
{
$gm = DB_Dataobject::factory('core_group_member');
$gm->group_id = $this->id;
+ $gm->autoJoin();
+ $gm->whereAdd('join_user_id_id.active = 1');
+ //PDO_DAtaObject::DebugLevel(1);
return $gm->count();
}
return $gm->count();
}
@@
-146,6
+161,8
@@
class Pman_Core_DataObjects_Core_group extends DB_DataObject
{
$gm = DB_Dataobject::factory('core_group_member');
$gm->group_id = $this->id;
{
$gm = DB_Dataobject::factory('core_group_member');
$gm->group_id = $this->id;
+ $gm->autoJoin();
+ $gm->whereAdd('join_user_id_id.active = 1');
return $gm->fetchAll('user_id');
}
return $gm->fetchAll('user_id');
}
@@
-160,7
+177,7
@@
class Pman_Core_DataObjects_Core_group extends DB_DataObject
function addMember($person,$roo = false)
{
if ($this->name == "Empty Group") {
function addMember($person,$roo = false)
{
if ($this->name == "Empty Group") {
- $roo->jerr('Cannot add the person into
the empty g
roup');
+ $roo->jerr('Cannot add the person into
Empty G
roup');
}
$gm = DB_Dataobject::factory('core_group_member');
$gm->group_id = $this->id;
}
$gm = DB_Dataobject::factory('core_group_member');
$gm->group_id = $this->id;
@@
-199,8
+216,6
@@
class Pman_Core_DataObjects_Core_group extends DB_DataObject
// groups databse is hard coded to person.. so this should not be used for other tables.????
$p = DB_Dataobject::factory( 'core_person' );
// groups databse is hard coded to person.. so this should not be used for other tables.????
$p = DB_Dataobject::factory( 'core_person' );
-
-
$p->whereAdd('id IN ('. implode(',', $ids) .')');
$p->active = 1;
$p->whereAdd('id IN ('. implode(',', $ids) .')');
$p->active = 1;
@@
-253,7
+268,7
@@
class Pman_Core_DataObjects_Core_group extends DB_DataObject
function initGroups()
{
function initGroups()
{
-
+
$g = DB_DataObject::factory($this->tableName());
$g->type = 0;
$g->name = 'Administrators';
$g = DB_DataObject::factory($this->tableName());
$g->type = 0;
$g->name = 'Administrators';