[Fmsystem-commits] [11444] property: bugfix

[Sigurd Nes]

Revision: 11444
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=11444
Author:   sigurdne
Date:     2013-11-11 15:26:45 +0000 (Mon, 11 Nov 2013)
Log Message:
-----------
property: bugfix

Modified Paths:
--------------
    trunk/property/inc/class.bocommon.inc.php
    trunk/property/inc/class.soentity.inc.php

Modified: trunk/property/inc/class.bocommon.inc.php
===================================================================
--- trunk/property/inc/class.bocommon.inc.php   2013-11-10 19:01:47 UTC (rev 
11443)
+++ trunk/property/inc/class.bocommon.inc.php   2013-11-11 15:26:45 UTC (rev 
11444)
@@ -1132,7 +1132,7 @@
                        $joinmethod             = 
isset($data['joinmethod'])?$data['joinmethod']:'';
                        $paranthesis            = 
isset($data['paranthesis'])?$data['paranthesis']:'';
                        $lookup                         = 
isset($data['lookup'])?$data['lookup']:'';
-                       $location_level         = 
isset($data['location_level'])?$data['location_level']:'';
+                       $location_level         = 
isset($data['location_level']) && $data['location_level'] ? 
(int)$data['location_level'] : 0;
                        $no_address             = 
isset($data['no_address'])?$data['no_address']:'';
                        $uicol_address          = 
isset($data['uicol_address'])?$data['uicol_address']:'';
                        $force_location         = 
isset($data['force_location'])?$data['force_location']:'';
@@ -1140,8 +1140,13 @@
                        $cols_return_lookup     = array();
 
                        $GLOBALS['phpgw']->config->read();
-                       $list_location_level = 
isset($GLOBALS['phpgw']->config->config_data['list_location_level'])     && 
$GLOBALS['phpgw']->config->config_data['list_location_level'] ? 
$GLOBALS['phpgw']->config->config_data['list_location_level'] : array();
+                       $list_location_level = 
isset($GLOBALS['phpgw']->config->config_data['list_location_level']) && 
$GLOBALS['phpgw']->config->config_data['list_location_level'] ? 
$GLOBALS['phpgw']->config->config_data['list_location_level'] : array();
 
+                       if($list_location_level > $location_level)
+                       {
+                               $list_location_level = $location_level;
+                       }
+
                        $soadmin_location       = 
CreateObject('property.soadmin_location');
                        $location_types = 
$soadmin_location->select_location_type();
                        $config = $soadmin_location->read_config('');

Modified: trunk/property/inc/class.soentity.inc.php
===================================================================
--- trunk/property/inc/class.soentity.inc.php   2013-11-10 19:01:47 UTC (rev 
11443)
+++ trunk/property/inc/class.soentity.inc.php   2013-11-11 15:26:45 UTC (rev 
11444)
@@ -786,6 +786,7 @@
                                        case 'loc1_name':
                                                $ordermethod = " ORDER BY 
fm_location1.loc1_name {$sort}";
                                                break;
+                                       case 'num':
                                        case 'id':
                                                $ordermethod = " ORDER BY 
{$entity_table}.id {$sort}";
                                                break;