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
4e456f6
..
862cad8
100644
(file)
--- a/
DataObjects/Core_group.php
+++ b/
DataObjects/Core_group.php
@@
-40,6
+40,7
@@
class Pman_Core_DataObjects_Core_group extends DB_DataObject
// group types??
function applyFilters($q, $au, $roo)
{
// group types??
function applyFilters($q, $au, $roo)
{
+
if (!empty($q['query']['name_starts'])) {
$v = $this->escape($q['query']['name_starts']);
$this->whereAdd("{$this->tableName()}.name like '{$v}%'");
if (!empty($q['query']['name_starts'])) {
$v = $this->escape($q['query']['name_starts']);
$this->whereAdd("{$this->tableName()}.name like '{$v}%'");
@@
-50,22
+51,29
@@
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("
+ $cp = DB_DataObject::Factory('core_person')->tableName();
+ $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
+ SELECT COUNT(${cgm}.user_id)
+ FROM
+ {$cgm}
+ LEFT JOIN
+ {$cp}
+ ON
+ ${cp}.id = {$cgm}.user_id
+ WHERE
+ ${cgm}.group_id = {$this->tableName()}.id
+ AND
+ ${cp}.active = 1
+ ) AS group_member_count
");
");
+
}
function toEventString() {
}
function toEventString() {
@@
-151,6
+159,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
+169,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,7
+276,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';
@@
-293,11
+306,24
@@
class Pman_Core_DataObjects_Core_group extends DB_DataObject
foreach($data as $gi) {
$g = DB_DataObject::factory($this->tableName());
foreach($data as $gi) {
$g = DB_DataObject::factory($this->tableName());
+
+ $o = false;
+
+ if($g->get('name', $gi['name'])){
+ $o = clone($g);
+ }
+
+ $display_name = (isset($gi['display_name'])) ? $gi['display_name'] : '';
+
+ unset($gi['display_name']);
+
$g->setFrom($gi);
$g->setFrom($gi);
-
- if(
!$g->find(tru
e)){
- $g->
insert()
;
+
+ if(
empty($o) || empty($o->display_nam
e)){
+ $g->
display_name = $display_name
;
}
}
+
+ (empty($o)) ? $g->insert() : $g->update($o);
if(count($g->members()) || empty($gi['members'])){
continue;
if(count($g->members()) || empty($gi['members'])){
continue;