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
5db1a5b
..
c9f12bc
100644
(file)
--- a/
DataObjects/Core_group.php
+++ b/
DataObjects/Core_group.php
@@
-50,22
+50,32
@@
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();;
+
+
+
+ $cp = DB_DataObject::Factory('core_person')->tableName();
+ $cgm = DB_DataObject::Factory('core_group_member')->tableName();
-
$this->selectAdd("
+ $this->selectAdd("
(
SELECT
count(user_id)
FROM
(
SELECT
count(user_id)
FROM
- {$cgm}
- WHERE
- {$this->tableName()}.id = {$cgm}.group_id
+ core_group_member
+
)
AS group_member_count
");
)
AS group_member_count
");
+
+
+
+
+ /*$cgmDBObj->joinAdd($cpObj);
+ $this->joinAdd($cgmDBObj);
+ DB_DataObject::debugLevel();*/
}
function toEventString() {
}
function toEventString() {
@@
-151,6
+161,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();
}
@@
-158,6
+171,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');
}
@@
-263,8
+278,7
@@
class Pman_Core_DataObjects_Core_group extends DB_DataObject
function initGroups()
{
function initGroups()
{
- print_r($this);
- var_dump($this->tableName()));
+
$g = DB_DataObject::factory($this->tableName());
$g->type = 0;
$g->name = 'Administrators';
$g = DB_DataObject::factory($this->tableName());
$g->type = 0;
$g->name = 'Administrators';