X-Git-Url: http://git.roojs.org/?p=Pman.Core;a=blobdiff_plain;f=DataObjects%2FProjectDirectory.php;h=f494e3c6f44545e40574c068904516fa24ea0ad4;hp=4342af7d32a1f1ed1974937c9aa20dcb9c3d384c;hb=HEAD;hpb=563d50c4d0d6390d65ccd1a4a2567bf60ef27a80

diff --git a/DataObjects/ProjectDirectory.php b/DataObjects/ProjectDirectory.php
index 4342af7d..f494e3c6 100644
--- a/DataObjects/ProjectDirectory.php
+++ b/DataObjects/ProjectDirectory.php
@@ -5,7 +5,7 @@
  * 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';
+class_exists('DB_DataObject') ? '' : require_once 'DB/DataObject.php';
 
 class Pman_Core_DataObjects_ProjectDirectory extends DB_DataObject 
 {
@@ -26,7 +26,7 @@ class Pman_Core_DataObjects_ProjectDirectory extends DB_DataObject
     
     function person()
     {
-        $p = DB_DataObject::factory('Person');
+        $p = DB_DataObject::factory('core_person');
         $p->get($this->person_id);
         return $p;
     }
@@ -35,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??
-        $c = DB_DataObject::factory('Companies');
+        $c = DB_DataObject::factory('core_company');
         $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 .')';
@@ -72,7 +72,7 @@ class Pman_Core_DataObjects_ProjectDirectory extends DB_DataObject
     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);          
             
@@ -169,13 +169,13 @@ class Pman_Core_DataObjects_ProjectDirectory extends DB_DataObject
         }
         
         
-        $pr = DB_DataObject::factory('Projects');
+        $pr = DB_DataObject::factory('core_project');
         $pr->whereAdd("Projects.type IN ('N','X')");
         $prjs = $pr->fetchAll('id');
         
         
         $pd = DB_DataObject::factory('ProjectDirectory');
-        $pd->joinAdd(DB_DataObject::factory('Projects'), 'LEFT');
+        $pd->joinAdd(DB_DataObject::factory('core_project'), 'LEFT');
         $pd->whereAdd("Projects.type NOT IN ('N','X')");
         $pd->person_id = $au->id;