[Fmsystem-commits] [6977] property: tune the filter on location form

[Sigurd Nes]

Revision: 6977
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=6977
Author:   sigurdne
Date:     2011-02-14 09:23:41 +0000 (Mon, 14 Feb 2011)
Log Message:
-----------
property: tune the filter on location form

Modified Paths:
--------------
    trunk/property/inc/class.bolocation.inc.php
    trunk/property/inc/class.uientity.inc.php

Modified: trunk/property/inc/class.bolocation.inc.php
===================================================================
--- trunk/property/inc/class.bolocation.inc.php 2011-02-12 20:21:19 UTC (rev 
6976)
+++ trunk/property/inc/class.bolocation.inc.php 2011-02-14 09:23:41 UTC (rev 
6977)
@@ -351,18 +351,17 @@
                                $m=$i;
                        }
 
-                       //_debug_array($fm_location_cols);die();
-                       //_debug_array($data);
-
-//die();
-
                        $location_cols_count =count($fm_location_cols);
                        for ($j=0;$j<$location_cols_count;$j++)
                        {
                                $_lookup_link = true;
-                               if(isset($data['no_link']) && $data['no_link'] 
&& $data['no_link'] <= $fm_location_cols[$j]['location_type'] + 2)
+                               if(isset($data['no_link']) && $data['no_link'])
                                {
                                        $_lookup_link = false;
+                                       if( $data['no_link'] < 
($fm_location_cols[$j]['location_type']+2))
+                                       {
+                                               $_lookup_link = true;
+                                       }
                                }
 
                                if( $fm_location_cols[$j]['lookup_form'] && 
$fm_location_cols[$j]['location_type'] == $data['type_id'] )
@@ -391,9 +390,13 @@
                        for ($j=0;$j<$config_count;$j++)
                        {
                                $_lookup_link = true;
-                               if(isset($data['no_link']) && $data['no_link'] 
&& $data['no_link'] <= $config[$j]['location_type'] + 2)
+                               if(isset($data['no_link']) && $data['no_link'])
                                {
                                        $_lookup_link = false;
+                                       if( $data['no_link'] < 
($config[$j]['location_type']+2))
+                                       {
+                                               $_lookup_link = true;
+                                       }
                                }
                                if($config[$j]['location_type'] <= 
$data['type_id'] && $config[$j]['lookup_form'] )
                                {

Modified: trunk/property/inc/class.uientity.inc.php
===================================================================
--- trunk/property/inc/class.uientity.inc.php   2011-02-12 20:21:19 UTC (rev 
6976)
+++ trunk/property/inc/class.uientity.inc.php   2011-02-14 09:23:41 UTC (rev 
6977)
@@ -1414,13 +1414,18 @@
                                $category['location_level']= -1;
                        }
 
+                       $_no_link = false;
+                       if($lookup_entity && $category['location_link_level'])
+                       {
+                               $_no_link = 
(int)$category['location_link_level'] + 2;
+                       }
                        if($entity['location_form'] )
                        {
                                
$location_data=$bolocation->initiate_ui_location(array
                                        (
                                                'values'        => 
$values['location_data'],
                                                'type_id'       => 
(int)$category['location_level'],
-                                               'no_link'       => 
$lookup_entity ? (int)$category['location_link_level'] + 2 : false, // disable 
lookup links for location type less than type_id
+                                               'no_link'       => $_no_link, 
// disable lookup links for location type less than type_id
                                                'lookup_type'   => $lookup_type,
                                                'tenant'        => 
$lookup_tenant,
                                                'lookup_entity' => 
$lookup_entity,