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
07a454e
..
a745be2
100644
(file)
--- a/
DataObjects/ProjectDirectory.php
+++ b/
DataObjects/ProjectDirectory.php
@@
-1,6
+1,9
@@
<?php
/**
* Table Definition for ProjectDirectory
<?php
/**
* Table Definition for ProjectDirectory
+ *
+ * Note - projectdirectory is linked to this - due to an issue with postgres - we should keep to lowercase names only for tables..
+ *
*/
require_once 'DB/DataObject.php';
*/
require_once 'DB/DataObject.php';
@@
-23,7
+26,7
@@
class Pman_Core_DataObjects_ProjectDirectory extends DB_DataObject
function person()
{
function person()
{
- $p = DB_DataObject::factory('
P
erson');
+ $p = DB_DataObject::factory('
core_p
erson');
$p->get($this->person_id);
return $p;
}
$p->get($this->person_id);
return $p;
}
@@
-32,9
+35,9
@@
class Pman_Core_DataObjects_ProjectDirectory extends DB_DataObject
$p = $this->person();
// this is weird... company is in the person.. - effieciency??
// for seaching??
$p = $this->person();
// this is weird... company is in the person.. - effieciency??
// for seaching??
- $c = DB_DataObject::factory('
Companies
');
+ $c = DB_DataObject::factory('
core_company
');
$c->get($this->company_id);
$c->get($this->company_id);
- $pr = DB_DataObject::factory('
Projects
');
+ $pr = DB_DataObject::factory('
core_project
');
$pr->get($this->project_id);
return $pr->code . ' '. $p->name . '('. $c->name .')';
$pr->get($this->project_id);
return $pr->code . ' '. $p->name . '('. $c->name .')';
@@
-69,7
+72,7
@@
class Pman_Core_DataObjects_ProjectDirectory extends DB_DataObject
function projects($au)
{
if (empty($au)) {
function projects($au)
{
if (empty($au)) {
- $p = DB_DataObject::Factory('
Projects
');
+ $p = DB_DataObject::Factory('
core_project
');
$p->get('code', '*PUBLIC');
return array($p->id);
$p->get('code', '*PUBLIC');
return array($p->id);
@@
-83,7
+86,7
@@
class Pman_Core_DataObjects_ProjectDirectory extends DB_DataObject
}
$c->selectAdd();
// people may have multiple roles for a project..
}
$c->selectAdd();
// people may have multiple roles for a project..
- $c->selectAdd(
'distinct(project_id) as project_id'
);
+ $c->selectAdd(
"distinct({$this->tableName()}.project_id) as project_id"
);
return $c->fetchAll('project_id');
}
/**
return $c->fetchAll('project_id');
}
/**
@@
-97,12
+100,12
@@
class Pman_Core_DataObjects_ProjectDirectory extends DB_DataObject
//echo '<PRE>';print_R($this);exit;
if (is_array($pr)) {
//echo '<PRE>';print_R($this);exit;
if (is_array($pr)) {
- $c->whereAddIn(
'project_id'
, $pr, 'int');
+ $c->whereAddIn(
"{$this->tableName()}.project_id"
, $pr, 'int');
} else {
$c->project_id = $pr->id;
}
$c->selectAdd();
} else {
$c->project_id = $pr->id;
}
$c->selectAdd();
- $c->selectAdd(
'person_id'
);
+ $c->selectAdd(
"{$this->tableName()}.person_id as person_id"
);
return $c->fetchAll('person_id');
return $c->fetchAll('person_id');