[Fmsystem-commits] [7299] Added the description field to select statement that fetches composite from database

[Torstein]

Revision: 7299
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=7299
Author:   vator
Date:     2011-05-25 05:49:39 +0000 (Wed, 25 May 2011)
Log Message:
-----------
Added the description field to select statement that fetches composite from 
database

Modified Paths:
--------------
    trunk/rental/inc/class.socomposite.inc.php

Modified: trunk/rental/inc/class.socomposite.inc.php
===================================================================
--- trunk/rental/inc/class.socomposite.inc.php  2011-05-24 09:40:16 UTC (rev 
7298)
+++ trunk/rental/inc/class.socomposite.inc.php  2011-05-25 05:49:39 UTC (rev 
7299)
@@ -161,7 +161,7 @@
                        {
                                $cols = "rental_composite.id AS composite_id,";
                        }
-                       $cols .= "rental_unit.id AS unit_id, 
rental_unit.location_code, rental_composite.name, 
rental_composite.has_custom_address, rental_composite.address_1, 
rental_composite.house_number, rental_composite.address_2, 
rental_composite.postcode, rental_composite.place, rental_composite.is_active, 
rental_composite.area, ";
+                       $cols .= "rental_unit.id AS unit_id, 
rental_unit.location_code, rental_composite.name, 
rental_composite.has_custom_address, rental_composite.address_1, 
rental_composite.house_number, rental_composite.address_2, 
rental_composite.postcode, rental_composite.place, rental_composite.is_active, 
rental_composite.area, rental_composite.description, ";
                        $cols .= "
                        CASE WHEN 
                        (
@@ -177,6 +177,7 @@
                $order = $sort_field ? "ORDER BY {$this->marshal($sort_field, 
'field')} $dir ": '';
 
            //var_dump("SELECT {$cols} FROM {$tables} {$joins} WHERE 
{$condition} {$order}");
+           
                return "SELECT {$cols} FROM {$tables} {$joins} WHERE 
{$condition} {$order}";
        }