[Fmsystem-commits] [8205]

[Erik Holm-Larsen]

Revision: 8205
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=8205
Author:   erikhl
Date:     2011-11-29 06:09:53 +0000 (Tue, 29 Nov 2011)
Log Message:
-----------


Modified Paths:
--------------
    trunk/activitycalendar/inc/class.soarena.inc.php
    trunk/activitycalendar/inc/class.soorganization.inc.php

Modified: trunk/activitycalendar/inc/class.soarena.inc.php
===================================================================
--- trunk/activitycalendar/inc/class.soarena.inc.php    2011-11-28 13:15:50 UTC 
(rev 8204)
+++ trunk/activitycalendar/inc/class.soarena.inc.php    2011-11-29 06:09:53 UTC 
(rev 8205)
@@ -49,6 +49,11 @@
                        }
                        $order = "ORDER BY 
{$this->marshal($sort_field,'field')} $dir";
                }
+               else if(!$return_count)
+               {
+                       $dir = $ascending ? 'ASC' : 'DESC';
+                       $order = "ORDER BY arena.arena_name $dir";
+               }
                
                if($search_for)
                {
@@ -134,7 +139,7 @@
                //{$this->left_join} rental_contract contract ON (contract.id = 
c_p.contract_id)";
 
                $joins = $join_contracts;
-               //var_dump("SELECT {$cols} FROM {$tables} {$joins} WHERE 
{$condition} {$order}");
+               var_dump("SELECT {$cols} FROM {$tables} {$joins} WHERE 
{$condition} {$order}");
                return "SELECT {$cols} FROM {$tables} {$joins} WHERE 
{$condition} {$order}";
        }
        

Modified: trunk/activitycalendar/inc/class.soorganization.inc.php
===================================================================
--- trunk/activitycalendar/inc/class.soorganization.inc.php     2011-11-28 
13:15:50 UTC (rev 8204)
+++ trunk/activitycalendar/inc/class.soorganization.inc.php     2011-11-29 
06:09:53 UTC (rev 8205)
@@ -54,7 +54,7 @@
                else if(!$return_count)
                {
                        $dir = $ascending ? 'ASC' : 'DESC';
-                       $order = "ORDER BY org.id $dir";
+                       $order = "ORDER BY org.name $dir";
                }
                if($search_for)
                {