DataObjects/Office.php

diff --git a/DataObjects/Office.php b/DataObjects/Office.php
index 3919ac0..1206a26 100644 (file)
--- a/DataObjects/Office.php
+++ b/DataObjects/Office.php
@@ -30,20 +30,20 @@ class Pman_Core_DataObjects_Office extends DB_DataObject
         
         if(!empty($q['_join_country_with_person'])){
             $tn = $this->tableName();
-            $this->selectAdd();
-            $this->selectAdd(" i18n_translate('c' , Office.country, 'en') as office_id_country_name");
+//            $this->selectAdd();
+//            $this->selectAdd(" i18n_translate('c' , Office.country, 'en') as office_id_country_name");
 //            $this->_extra_col = array('office_country_name');
 //            $this->_distinct= 'office_id_country&cols=office_id_country,office_id_country_name';
             //then the query should be _distinct=office_id_country&cols=office_id_country,office_id_country_name
-//            $p = DB_DataObject::factory('Person');
-//            $p->whereAdd("office_id > 0");
-//            $p->selectAdd();
-//            $p->selectAdd("DISTINCT(office_id) as office_id");
-//            $officeIds = $p->fetchAll('office_id');
-//            $this->whereAddIn($tn.'.id', $officeIds, 'INT');
-//            $this->selectAdd();
-//            $this->selectAdd("DISTINCT({$tn}.country) as country");
-//            $this->joinAddCountryWithPerson();
+            $p = DB_DataObject::factory('Person');
+            $p->whereAdd("office_id > 0");
+            $p->selectAdd();
+            $p->selectAdd("DISTINCT(office_id) as office_id");
+            $officeIds = $p->fetchAll('office_id');
+            $this->whereAddIn($tn.'.id', $officeIds, 'INT');
+            $this->selectAdd();
+            $this->selectAdd("DISTINCT({$tn}.country) as country");
+            $this->joinAddCountryWithPerson();
         }
     }