[Fmsystem-commits] [13846] Rental:fix sql

[Sigurd Nes]

Revision: 13846
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=13846
Author:   sigurdne
Date:     2015-09-03 16:31:42 +0000 (Thu, 03 Sep 2015)
Log Message:
-----------
Rental:fix sql

Modified Paths:
--------------
    trunk/rental/inc/class.socommon.inc.php
    trunk/rental/inc/class.soparty.inc.php

Modified: trunk/rental/inc/class.socommon.inc.php
===================================================================
--- trunk/rental/inc/class.socommon.inc.php     2015-09-03 15:12:56 UTC (rev 
13845)
+++ trunk/rental/inc/class.socommon.inc.php     2015-09-03 16:31:42 UTC (rev 
13846)
@@ -226,7 +226,23 @@
                        $sql_parts_filter = explode('FROM',$sql, 2);
 
                        $sql_filter = "SELECT DISTINCT 
{$id_field_name_info['table']}.{$id_field_name_info['field']} AS 
{$id_field_name_info['translated']}";
-                       $_sort_field = $this->sort_field ? $this->sort_field : 
$sort_field;
+
+                       if($this->sort_field)
+                       {
+                               if(is_array($this->sort_field))
+                               {
+                                       $_sort_field = implode(',', 
$this->sort_field);
+                               }
+                               else
+                               {
+                                       $_sort_field = $this->sort_field;
+                               }
+                       }
+                       else
+                       {
+                               $_sort_field =  $sort_field;
+                       }
+
                        if($_sort_field && $_sort_field != 
$id_field_name_info['translated'])
                        {
                                $sql_filter .= ",{$_sort_field}";

Modified: trunk/rental/inc/class.soparty.inc.php
===================================================================
--- trunk/rental/inc/class.soparty.inc.php      2015-09-03 15:12:56 UTC (rev 
13845)
+++ trunk/rental/inc/class.soparty.inc.php      2015-09-03 16:31:42 UTC (rev 
13846)
@@ -79,12 +79,15 @@
                        if($sort_field == 'name')
                        {
                                $order = "ORDER BY party.last_name {$dir}, 
party.first_name {$dir}";
+                               $this->sort_field = array('party.last_name', 
'party.first_name');
                        }
                        else
                        {
                                if($sort_field == 'address')
                                {
                                        $sort_field = 'party.address_1';
+                                       $this->sort_field = 
array('party.address_1');
+
                                }
                                $order = "ORDER BY 
{$this->marshal($sort_field,'field')} $dir";
                        }