From 38c3d54c4f1f87eb9226400b845b2aa0124f36fd Mon Sep 17 00:00:00 2001
From: Gustavo Martin Morcuende <gu.martinm@gmail.com>
Date: Wed, 16 May 2012 03:54:22 +0200
Subject: [PATCH] Language Company Category fields.

Using the user's language to show the name of the company category fields
related to one ad.
---
 .../modules/ad/actions/actions.class.php             |  1 +
 apps/companyfront/modules/ad/templates/_list.php     |  3 ++-
 .../modules/ad/templates/indexSuccess.php            |  2 +-
 lib/form/doctrine/AdDescriptionForm.class.php        |  1 -
 .../CompanyCategoryDescriptionTable.class.php        | 20 +++++++++++++++++++-
 5 files changed, 23 insertions(+), 4 deletions(-)

diff --git a/apps/companyfront/modules/ad/actions/actions.class.php b/apps/companyfront/modules/ad/actions/actions.class.php
index 8e78acd..dddc753 100644
--- a/apps/companyfront/modules/ad/actions/actions.class.php
+++ b/apps/companyfront/modules/ad/actions/actions.class.php
@@ -51,6 +51,7 @@ class adActions extends sfActions
     $this->pager->init();
 
 
+    $this->userLanguageId = $this->getUser()->getGuardUser()->getLanguage()->getId();
     $this->languageCode = $language->getCode();
   }
 
diff --git a/apps/companyfront/modules/ad/templates/_list.php b/apps/companyfront/modules/ad/templates/_list.php
index 09e66bd..bad7921 100644
--- a/apps/companyfront/modules/ad/templates/_list.php
+++ b/apps/companyfront/modules/ad/templates/_list.php
@@ -18,7 +18,8 @@
     <?php foreach ($ads as $ad): ?>
     <tr>
       <td><img src="<?php echo $ad->getAd()->getAdMobileImageLink() ?>" alt="<?php echo $ad->getAdName() ?>"/></td>
-      <td><?php echo $ad->getAd()->getCompanyCategId() ?></td>
+      <td><?php echo CompanyCategoryDescriptionTable::getInstance()->getCategGeneralFromIdDAOImpl($userLanguageId, $ad->getAd()->getCompanyCategId())->get(0)->company_categ_name?></td>
+
       <td><?php echo $ad->getAdName() ?></td>
 	  <td><a href="<?php echo url_for('ad/edit?id='.$ad->getAd()->getId()) ?>"><img src="/images/pencil_add.png" alt="" title="" border="0" /></a></td>
       <td><?php echo link_to('<img src="/images/inadminpanel/images/trash.png" alt="" title="" border="0" />', 'ad/delete?id='.$ad->getAd()->getId(), array('method' => 'delete', 'confirm' => 'Are you sure?')) ?></td>
diff --git a/apps/companyfront/modules/ad/templates/indexSuccess.php b/apps/companyfront/modules/ad/templates/indexSuccess.php
index 5c2dfd1..810802e 100644
--- a/apps/companyfront/modules/ad/templates/indexSuccess.php
+++ b/apps/companyfront/modules/ad/templates/indexSuccess.php
@@ -12,7 +12,7 @@
   </table>
 </form>
 
-<?php include_partial('ad/list', array('ads' => $pager->getResults())) ?>
+<?php include_partial('ad/list', array('ads' => $pager->getResults(), 'userLanguageId' => $userLanguageId)) ?>
 
 <?php if ($pager->haveToPaginate()): ?>
   <div class="pagination">
diff --git a/lib/form/doctrine/AdDescriptionForm.class.php b/lib/form/doctrine/AdDescriptionForm.class.php
index f2c17d0..4db1436 100644
--- a/lib/form/doctrine/AdDescriptionForm.class.php
+++ b/lib/form/doctrine/AdDescriptionForm.class.php
@@ -12,7 +12,6 @@ class AdDescriptionForm extends BaseAdDescriptionForm
 {
   public function configure()
   {
-    //$this->useFields(array('language_id', 'ad_id', 'ad_name', 'ad_description', 'ad_mobile_text', 'ad_link'));
     unset($this['ad_id']);
 
     if ($this->object->exists())
diff --git a/lib/model/doctrine/CompanyCategoryDescriptionTable.class.php b/lib/model/doctrine/CompanyCategoryDescriptionTable.class.php
index e7d82bd..c3b0ece 100644
--- a/lib/model/doctrine/CompanyCategoryDescriptionTable.class.php
+++ b/lib/model/doctrine/CompanyCategoryDescriptionTable.class.php
@@ -16,4 +16,22 @@ class CompanyCategoryDescriptionTable extends Doctrine_Table
     {
         return Doctrine_Core::getTable('CompanyCategoryDescription');
     }
-}
\ No newline at end of file
+
+
+   /**
+    * Return
+    *
+    * @return Doctrine Collection
+    */
+    public function getCategGeneralFromIdDAOImpl($languageId, $companyCategId)
+    {
+         $q = Doctrine_Query::create()
+                        ->from('CompanyCategoryDescription cgd')
+                        ->where('cgd.company_categ_id = ?', $companyCategId)
+                        ->andWhere('cgd.language_id = ?', $languageId);
+
+        $doccollect=$q->execute();
+
+        return $doccollect;
+    }
+}
-- 
2.1.4