[Fmsystem-commits] [12588]

[Nelson Guerra]

Revision: 12588
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=12588
Author:   nelson224
Date:     2015-01-12 23:31:08 +0000 (Mon, 12 Jan 2015)
Log Message:
-----------


Modified Paths:
--------------
    branches/dev-syncromind/property/inc/class.uilookup.inc.php

Modified: branches/dev-syncromind/property/inc/class.uilookup.inc.php
===================================================================
--- branches/dev-syncromind/property/inc/class.uilookup.inc.php 2015-01-12 
23:30:53 UTC (rev 12587)
+++ branches/dev-syncromind/property/inc/class.uilookup.inc.php 2015-01-12 
23:31:08 UTC (rev 12588)
@@ -1706,11 +1706,11 @@
                        $action = '';
                        for ($i=0;$i<count($input_name);$i++)
                        {
-                               $action .= 
"parent.document.getElementsByName('{$input_name[$i]}')[0].value = '';\r\n";
+                               $action .= 
"parent.document.getElementsByName('{$input_name[$i]}')[0].value = ''; \r\n";
                        }
                        for ($i=0;$i<count($input_name);$i++)
                        {
-                               $action .= 
"parent.document.getElementsByName('{$input_name[$i]}')[0].value = 
aData['{$input_name[$i]}'];\r\n";
+                               $action .= "if (typeof 
aData['{$input_name[$i]}'] !== 'undefined'){ 
parent.document.getElementsByName('{$input_name[$i]}')[0].value = 
aData['{$input_name[$i]}']; } \r\n";
                        }
                        $action .= 
'parent.JqueryPortico.onPopupClose("close");'."\r";
                        
@@ -1761,7 +1761,7 @@
                                        }
                                        $head .= '</thead>';
 
-                                       $datatable_def[] = array
+                                       $datatable_def = array
                                        (
                                                'container'             => 
'datatable-container',
                                                'requestUrl'    => 
self::link(array(
@@ -1773,11 +1773,7 @@
                                                                                
                'criteria_id'           => $this->criteria_id,
                                                                                
                'phpgw_return_as'       => 'json'
                                                                                
        )),
-                                               'ColumnDefs'    => $entity_def,
-                                               'config'                => 
array(
-                                                       array('disableFilter' 
=> true),
-                                                       
array('disablePagination' => true)
-                                               )
+                                               'ColumnDefs'    => $entity_def
                                        );
 
                                        $data = array
@@ -1801,7 +1797,8 @@
                                                'query' => $search['value'],
                                                'order' => 
$columns[$order[0]['column']]['data'],
                                                'sort' => $order[0]['dir'],
-                                               'allrows' => 
phpgw::get_var('length', 'int') == -1
+                                               'allrows' => 
phpgw::get_var('length', 'int') == -1,
+                                               'lookup' => true
                                        );
 
                                        $values = $boentity->read($params);
@@ -1830,10 +1827,8 @@
                                'datatable' => array(
                                        'source' => self::link(array(
                                                        'menuaction'            
=> 'property.uilookup.entity',
-                                                       'second_display'        
=> $second_display,
+                                                       'second_display'        
=> 1,
                                                        'entity_id'             
        => $this->entity_id,
-                                                       'district_id'           
=> $this->district_id,
-                                                       'criteria_id'           
=> $this->criteria_id,
                                                        'phpgw_return_as'       
=> 'json'
                                        )),
                                        'allrows'       => true,
@@ -1842,17 +1837,10 @@
                                )
                        );
                        
-                       $code = "
-                                               var api = oTable.api();
-                                       api.destroy();
-                                               
$('#datatable-container').empty();
-                               ";
-                       
                        $values_combo_box[0] = 
$boentity->select_category_list('filter', $this->cat_id);
                        array_unshift ($values_combo_box[0], array('id'=>'', 
'name'=>lang('no category')));
                        $filters[0] = array('type' => 'filter-category',
                                                'name' => 'cat_id',
-                                               'extra' => $code,
                                                'text' => lang('category'),
                                                'list' => $values_combo_box[0]
                                        );