projects
/
Pman.Core
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
DataObjects/Core_person.php
[Pman.Core]
/
DataObjects
/
Core_group.php
diff --git
a/DataObjects/Core_group.php
b/DataObjects/Core_group.php
index
596efce
..
613a77d
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}%'");
@@
-53,35
+54,42
@@
class Pman_Core_DataObjects_Core_group extends DB_DataObject
$roo->jok($core_group->memberCount());
}
}
$roo->jok($core_group->memberCount());
}
}
-
- DB_DataObject::debugLevel(1);
- $core_group = DB_DataObject::factory('core_group');
+
+ 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();
$cp = DB_DataObject::Factory('core_person')->tableName();
$cgm = DB_DataObject::Factory('core_group_member')->tableName();
- $cpObj->active = 1; // set the where condition with active = 1
-
+
$this->selectAdd("
(
$this->selectAdd("
(
- SELECT
- count(user_id)
- FROM
- {$cgm}
- WHERE
- {$this->tableName()}.id = {$cgm}.group_id
- AND
- {$cgm}.user_id = {$cp}.id
- AND
- {$cp}.active = 1
- )
- 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
");
");
- DB_DataObject::debugLevel();
-
-
-
- /*$cgmDBObj->joinAdd($cpObj);
- $this->joinAdd($cgmDBObj);
- DB_DataObject::debugLevel();*/
+
}
function toEventString() {
}
function toEventString() {
@@
-97,7
+105,11
@@
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);
switch($q['_action']) {
case 'add':
$g->addMember($uid,$roo);
@@
-198,6
+210,7
@@
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();
}
@@
-314,11
+327,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;