[Fmsystem-commits] [8641]

[Torstein]

Revision: 8641
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=8641
Author:   vator
Date:     2012-01-21 13:05:25 +0000 (Sat, 21 Jan 2012)
Log Message:
-----------


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

Modified: trunk/controller/inc/class.uicontrol.inc.php
===================================================================
--- trunk/controller/inc/class.uicontrol.inc.php        2012-01-21 12:05:36 UTC 
(rev 8640)
+++ trunk/controller/inc/class.uicontrol.inc.php        2012-01-21 13:05:25 UTC 
(rev 8641)
@@ -243,8 +243,6 @@
                                $control = $this->so->get_single($control_id);
                        }
 
-                       $control_areas_array = 
$this->so_control_area->get_control_areas_as_array();
-
                        // Sigurd: START as categories
                        $cats   = CreateObject('phpgwapi.categories', -1, 
'controller', '.control');
                        $cats->supress_info     = true;
@@ -262,9 +260,9 @@
                        }
                        // END as categories
 
-                       // Fetches prosedures that are related to first control 
area in list
-                       $control_area_id = $control_areas_array[0]['id'];
-                       $procedures_array = 
$this->so_procedure->get_procedures_by_control_area_id($control_area_id);
+                       echo "Control area id: " . 
$control->get_control_area_id();
+                       
+                       $procedures_array = 
$this->so_procedure->get_procedures_by_control_area_id($control->get_control_area_id());
                        $role_array = $this->so->get_roles();
                        
                        $tabs = array( array(
@@ -282,8 +280,7 @@
                                'tabs'                                          
=> $GLOBALS['phpgw']->common->create_tabs($tabs, 0),
                                'view'                                          
=> "control_details",
                                'editable'                                      
=> true,
-                               'control'                                       
=> (isset($control)) ? $control->toArray(): null,
-                               'control_areas_array'           => 
$control_areas_array,
+                               'control'                                       
=> $control->toArray(),
                                'control_areas_array2'          => 
array('options' => $control_areas_array2),
                                'procedures_array'                      => 
$procedures_array,
                                'role_array'                            => 
$role_array