X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=DataObjects%2FProjectDirectory.php;h=a745be29d446ead7bb945ac1696fe8464282f87f;hb=e5f4eb852ecd5ba7c5d574ae0ada8fe5e4d7de52;hp=bb0ad337733426f70834c50997fb6fff1352393c;hpb=ea0da667580412dfd01ac990d5d2d7edd65bbe8e;p=Pman.Core

diff --git a/DataObjects/ProjectDirectory.php b/DataObjects/ProjectDirectory.php
index bb0ad337..a745be29 100644
--- a/DataObjects/ProjectDirectory.php
+++ b/DataObjects/ProjectDirectory.php
@@ -1,6 +1,9 @@
 <?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';
 
@@ -23,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;
     }
@@ -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??
-        $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 .')';
@@ -69,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);          
             
@@ -83,7 +86,7 @@ class Pman_Core_DataObjects_ProjectDirectory extends DB_DataObject
         }
         $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');
     }
         /**
@@ -94,12 +97,15 @@ class Pman_Core_DataObjects_ProjectDirectory extends DB_DataObject
     function people($pr)
     {
         $c = clone ($this);
-        $c->autoJoin();
+        //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();
+        $c->selectAdd("{$this->tableName()}.person_id as person_id");
         return $c->fetchAll('person_id');