[Fmsystem-commits] [6561] Property: More on roles

[Sigurd Nes]

Revision: 6561
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=6561
Author:   sigurdne
Date:     2010-11-09 14:28:32 +0000 (Tue, 09 Nov 2010)
Log Message:
-----------
Property: More on roles

Modified Paths:
--------------
    trunk/property/inc/class.menu.inc.php
    trunk/property/inc/class.uilocation.inc.php

Modified: trunk/property/inc/class.menu.inc.php
===================================================================
--- trunk/property/inc/class.menu.inc.php       2010-11-09 14:28:18 UTC (rev 
6560)
+++ trunk/property/inc/class.menu.inc.php       2010-11-09 14:28:32 UTC (rev 
6561)
@@ -555,6 +555,12 @@
                                        'text'  =>      lang('Summary'),
                                        'image' => array('property', 
'location_summary')
                                );
+                               $children['responsiblility_role'] = array
+                               (
+                                       'url'   =>      
$GLOBALS['phpgw']->link('/index.php',array('menuaction'=> 
'property.uilocation.responsiblility_role')),
+                                       'text'  =>      lang('responsiblility 
role'),
+                                       'image' => array('property', 
'responsiblility_role')
+                               );
 
 /*                             if ( $acl->check('.location', 16, 'property') )
                                {

Modified: trunk/property/inc/class.uilocation.inc.php
===================================================================
--- trunk/property/inc/class.uilocation.inc.php 2010-11-09 14:28:18 UTC (rev 
6560)
+++ trunk/property/inc/class.uilocation.inc.php 2010-11-09 14:28:32 UTC (rev 
6561)
@@ -866,6 +866,7 @@
 
 
 
+
                        }
 
                        $datatable['pagination']['records_total']       = 
$this->bo->total_records;
@@ -1022,14 +1023,7 @@
                                $type_id = 1;
                        }
 
-                       if ( $type_id && !$lookup_tenant )
-                       {
-                               
$GLOBALS['phpgw_info']['flags']['menu_selection'] .= "::loc_$type_id";
-                       }
-                       else
-                       {
-                               
$GLOBALS['phpgw_info']['flags']['menu_selection'] .= '::tenant';
-                       }
+                       $GLOBALS['phpgw_info']['flags']['menu_selection'] .= 
'::responsiblility_role';
 
                        if (!$this->acl_read)
                        {
@@ -2004,6 +1998,7 @@
                                'lookup_tenant' => $lookup_tenant
                        );
 
+
                        $lookup_type = $view ? 'view' : 'form';
 
                        if(!$location_code && $parent)