[Fmsystem-commits] [13601] rental: order by

[Sigurd Nes]

Revision: 13601
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=13601
Author:   sigurdne
Date:     2015-07-09 09:29:44 +0000 (Thu, 09 Jul 2015)
Log Message:
-----------
rental: order by

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

Modified: trunk/rental/inc/class.socommon.inc.php
===================================================================
--- trunk/rental/inc/class.socommon.inc.php     2015-07-09 08:30:04 UTC (rev 
13600)
+++ trunk/rental/inc/class.socommon.inc.php     2015-07-09 09:29:44 UTC (rev 
13601)
@@ -226,9 +226,10 @@
                        $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']}";
-                       if($sort_field && $sort_field != 
$id_field_name_info['translated'])
+                       $_sort_field = $this->sort_field ? $this->sort_field : 
$sort_field;
+                       if($_sort_field && $_sort_field != 
$id_field_name_info['translated'])
                        {
-                               $sql_filter .= $this->sort_field ? 
",{$this->sort_field}" :",{$sort_field}";
+                               $sql_filter .= ",{$_sort_field}";
                        }
 
                        $sql_filter .= " FROM {$sql_parts_filter[1]}";

Modified: trunk/rental/inc/class.socontract.inc.php
===================================================================
--- trunk/rental/inc/class.socontract.inc.php   2015-07-09 08:30:04 UTC (rev 
13600)
+++ trunk/rental/inc/class.socontract.inc.php   2015-07-09 09:29:44 UTC (rev 
13601)
@@ -277,10 +277,12 @@
                                case 'closing_due_date':
                                        $filter_clauses[] = "contract.due_date 
>= {$ts_query} AND (contract.due_date - (type.notify_before_due_date * (24 * 60 
* 60)))  <= {$ts_query}";
                                        $order = "ORDER BY contract.due_date 
ASC";
+                                       $this->sort_field = 'contract.due_date';
                                        break;
                                case 'terminated_contracts':
                                        $filter_clauses[] = "contract.date_end 
>= ({$ts_query} - (type.notify_after_termination_date * (24 * 60 * 60))) AND 
contract.date_end < {$ts_query}";
                                        $order = "ORDER BY contract.date_end 
DESC";
+                                       $this->sort_field = 'contract.date_end';
                                        break;
                                case 'ended':
                                        $filter_clauses[] = "contract.date_end 
< {$ts_query}" ;