[Fmsystem-commits] [8747]

[Torstein]

Revision: 8747
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=8747
Author:   vator
Date:     2012-01-31 19:22:31 +0000 (Tue, 31 Jan 2012)
Log Message:
-----------


Modified Paths:
--------------
    trunk/controller/inc/class.uicontrol_location.inc.php

Modified: trunk/controller/inc/class.uicontrol_location.inc.php
===================================================================
--- trunk/controller/inc/class.uicontrol_location.inc.php       2012-01-31 
19:00:31 UTC (rev 8746)
+++ trunk/controller/inc/class.uicontrol_location.inc.php       2012-01-31 
19:22:31 UTC (rev 8747)
@@ -256,7 +256,7 @@
                                        'part_of_town_list'             => 
$part_of_town_list
                                ),
                                'datatable' => array(
-                                       'source' => 
self::link(array('menuaction' => 'controller.uicontrol_location.index', 
'phpgw_return_as' => 'json')),
+                                       'source' => 
self::link(array('menuaction' => 'controller.uicontrol_location.index', 
'phpgw_return_as' => 'json', 'view_type' => 'register_control')),
                                        'field' => array(
                                                array(
                                                        'key' => 
'location_code',
@@ -324,8 +324,6 @@
                                $results['total_records'] = count( 
$locations_for_control_array );
                                $results['start'] = 1;
                                $results['sort'] = 'location_code';
-                                                       
-                               array_walk($results['results'], array($this, 
'add_actions'), array($type));
                        }
                        else
                        {
@@ -337,6 +335,7 @@
                
                public function query(){
                        $type_id = phpgw::get_var('type_id');
+                       $view_type = phpgw::get_var('view_type');
                        $return_results = phpgw::get_var('results', 'int', 
'REQUEST', 0);
                        
                        $type_id = $type_id ? $type_id : 1;