[Fmsystem-commits] [8236]

[Erik Holm-Larsen]

Revision: 8236
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=8236
Author:   erikhl
Date:     2011-12-05 09:05:12 +0000 (Mon, 05 Dec 2011)
Log Message:
-----------


Modified Paths:
--------------
    trunk/controller/inc/class.menu.inc.php
    trunk/controller/inc/class.uicheck_list_for_location.inc.php

Modified: trunk/controller/inc/class.menu.inc.php
===================================================================
--- trunk/controller/inc/class.menu.inc.php     2011-12-05 09:01:59 UTC (rev 
8235)
+++ trunk/controller/inc/class.menu.inc.php     2011-12-05 09:05:12 UTC (rev 
8236)
@@ -27,14 +27,22 @@
                                        (
                                                'text'  => lang('Control'),
                                                'url'   => 
$GLOBALS['phpgw']->link('/index.php', array('menuaction'=> 
'controller.uicontrol.control_list') ),
-                                   'image'     => array('property', 
'location_1')
+                                   'image'     => array('property', 
'location_1'),
+                                               'children' => array(
+                                                                               
        'location_for_check_list' => array
+                                                                               
        (
+                                                                               
                'text'  => lang('Location'),
+                                                                               
                'url'   => $GLOBALS['phpgw']->link('/index.php', 
array('menuaction'=> 'controller.uicheck_list_for_location.index') ),
+                                                                               
    'image'     => array('property', 'location_1')
+                                                                               
),
+                                                                               
'equipment_for_check_list' => array
+                                                                               
        (
+                                                                               
                'text'  => lang('Equipment'),
+                                                                               
                'url'   => $GLOBALS['phpgw']->link('/index.php', 
array('menuaction'=> 'controller.uicheck_list_for_equipment.index') ),
+                                                                               
    'image'     => array('property', 'entity_1')
+                                                                               
)
+                                                                               
)
                                        ),
-                                       'location_for_check_list' => array
-                                       (
-                                               'text'  => lang('Location'),
-                                               'url'   => 
$GLOBALS['phpgw']->link('/index.php', array('menuaction'=> 
'controller.uicheck_list_for_location.index') ),
-                                   'image'     => array('property', 
'location_1')
-                               ),
                                        'control_item' => array
                                        (
                                                'text'  => lang('Control_item'),

Modified: trunk/controller/inc/class.uicheck_list_for_location.inc.php
===================================================================
--- trunk/controller/inc/class.uicheck_list_for_location.inc.php        
2011-12-05 09:01:59 UTC (rev 8235)
+++ trunk/controller/inc/class.uicheck_list_for_location.inc.php        
2011-12-05 09:05:12 UTC (rev 8236)
@@ -47,6 +47,8 @@
                        $this->allrows                          = 
$this->bo->allrows;
                        $this->lookup                           = 
$this->bo->lookup;
                        $this->location_code            = 
$this->bo->location_code;
+                       
+                       
self::set_active_menu('controller::control::location_for_check_list');
                }       
        
                function index()