[Fmsystem-commits] [17006] property: location exception

[sigurdne]

Revision: 17006
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=17006
Author:   sigurdne
Date:     2017-08-28 13:30:05 -0400 (Mon, 28 Aug 2017)
Log Message:
-----------
property: location exception

Modified Paths:
--------------
    trunk/property/inc/class.sogeneric_.inc.php
    trunk/property/inc/class.uigeneric.inc.php
    trunk/property/setup/setup.inc.php

Modified: trunk/property/inc/class.sogeneric_.inc.php
===================================================================
--- trunk/property/inc/class.sogeneric_.inc.php 2017-08-28 15:35:24 UTC (rev 
17005)
+++ trunk/property/inc/class.sogeneric_.inc.php 2017-08-28 17:30:05 UTC (rev 
17006)
@@ -68,6 +68,7 @@
                        $custom_filter = isset($data['custom_filter']) && 
$data['custom_filter'] ? $data['custom_filter'] : array();
                        $filter = isset($data['filter']) && $data['filter'] ? 
$data['filter'] : array();
                        $results = isset($data['results']) ? 
(int)$data['results'] : 0;
+                       $dry_run = isset($data['dry_run']) ? $data['dry_run'] : 
'';
 
                        $values = array();
                        if (!isset($this->location_info['table']) || !$table = 
$this->location_info['table'])
@@ -214,6 +215,11 @@
 
                        $this->uicols = $uicols;
 
+                       if($dry_run)
+                       {
+                               return array();
+                       }
+
                        if ($order)
                        {
                                $ordermethod = " ORDER BY {$table}.{$order} 
{$sort}";
@@ -353,7 +359,7 @@
 
                public function get_name( $data )
                {
-                       if (isset($data['type']) && $data['type'] && ! 
$this->location_info)
+                       if (isset($data['type']) && $data['type'])
                        {
                                $this->get_location_info($data['type']);
                        }

Modified: trunk/property/inc/class.uigeneric.inc.php
===================================================================
--- trunk/property/inc/class.uigeneric.inc.php  2017-08-28 15:35:24 UTC (rev 
17005)
+++ trunk/property/inc/class.uigeneric.inc.php  2017-08-28 17:30:05 UTC (rev 
17006)
@@ -408,7 +408,7 @@
                                array_unshift($data['form']['toolbar']['item'], 
$filter);
                        }
 
-                       $this->bo->read();
+                       $this->bo->read(array('dry_run' => true));
                        $uicols = $this->bo->uicols;
 
                        $count_uicols_name = count($uicols['name']);

Modified: trunk/property/setup/setup.inc.php
===================================================================
--- trunk/property/setup/setup.inc.php  2017-08-28 15:35:24 UTC (rev 17005)
+++ trunk/property/setup/setup.inc.php  2017-08-28 17:30:05 UTC (rev 17006)
@@ -11,7 +11,7 @@
         * @version $Id$
        */
        $setup_info['property']['name']                 = 'property';
-       $setup_info['property']['version']              = '0.9.17.714';
+       $setup_info['property']['version']              = '0.9.17.715';
        $setup_info['property']['app_order']    = 8;
        $setup_info['property']['enable']               = 1;
        $setup_info['property']['app_group']    = 'office';