projects
/
Pman.Core
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
DataObjects/ProjectDirectory.php
[Pman.Core]
/
DataObjects
/
ProjectDirectory.php
diff --git
a/DataObjects/ProjectDirectory.php
b/DataObjects/ProjectDirectory.php
index
4df19fd
..
d2c5733
100644
(file)
--- a/
DataObjects/ProjectDirectory.php
+++ b/
DataObjects/ProjectDirectory.php
@@
-68,12
+68,22
@@
class Pman_Core_DataObjects_ProjectDirectory extends DB_DataObject
*/
function projects($au)
{
*/
function projects($au)
{
+ if (empty($au)) {
+ $p = DB_DataObject::Factory('Projects');
+ $p->get('code', '*PUBLIC');
+ return array($p->id);
+
+ }
$c = clone ($this);
$c = clone ($this);
+
if (is_array($au)) {
$c->whereAddIn('person_id', $au, 'int');
} else {
$c->person_id = $au->id;
}
if (is_array($au)) {
$c->whereAddIn('person_id', $au, 'int');
} else {
$c->person_id = $au->id;
}
+ $c->selectAdd();
+ // people may have multiple roles for a project..
+ $c->selectAdd("distinct({this->tableName()}.project_id) as project_id");
return $c->fetchAll('project_id');
}
/**
return $c->fetchAll('project_id');
}
/**
@@
-84,11
+94,15
@@
class Pman_Core_DataObjects_ProjectDirectory extends DB_DataObject
function people($pr)
{
$c = clone ($this);
function people($pr)
{
$c = clone ($this);
+ //echo '<PRE>';print_R($this);exit;
+
if (is_array($pr)) {
$c->whereAddIn('project_id', $pr, 'int');
} else {
$c->project_id = $pr->id;
}
if (is_array($pr)) {
$c->whereAddIn('project_id', $pr, 'int');
} else {
$c->project_id = $pr->id;
}
+ $c->selectAdd();
+ $c->selectAdd('person_id');
return $c->fetchAll('person_id');
return $c->fetchAll('person_id');
@@
-114,7
+128,7
@@
class Pman_Core_DataObjects_ProjectDirectory extends DB_DataObject
$xx = DB_Dataobject::factory('ProjectDirectory');
$xx->setFrom(array(
'project_id' => $this->project_id,
$xx = DB_Dataobject::factory('ProjectDirectory');
$xx->setFrom(array(
'project_id' => $this->project_id,
- 'person_id' => $this->person_id,
+ 'person_id'
=> $this->person_id,
'company_id' => $this->company_id,
));
'company_id' => $this->company_id,
));