[Phpgroupware-cvs] hrm/inc class.boadmin.inc.php

[Sigurd Nes]

CVSROOT:        /sources/phpgroupware
Module name:    hrm
Branch:         
Changes by:     Sigurd Nes <address@hidden>     06/02/24 13:24:05

Modified files:
        inc            : class.boadmin.inc.php 

Log message:
        Added inheritance of rights

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/phpgroupware/hrm/inc/class.boadmin.inc.php.diff?tr1=1.6&tr2=1.7&r1=text&r2=text

Patches:
Index: hrm/inc/class.boadmin.inc.php
diff -u hrm/inc/class.boadmin.inc.php:1.6 hrm/inc/class.boadmin.inc.php:1.7
--- hrm/inc/class.boadmin.inc.php:1.6   Thu Dec  1 14:37:55 2005
+++ hrm/inc/class.boadmin.inc.php       Fri Feb 24 13:24:05 2006
@@ -8,7 +8,7 @@
        * @internal Development of this application was funded by 
http://www.bergen.kommune.no/bbb_/ekstern/
        * @package hrm
        * @subpackage admin
-       * @version $Id: class.boadmin.inc.php,v 1.6 2005/12/01 14:37:55 
sigurdne Exp $
+       * @version $Id: class.boadmin.inc.php,v 1.7 2006/02/24 13:24:05 
sigurdne Exp $
        */
 
        /**
@@ -141,22 +141,9 @@
                                        break;
                        }
 
-//                     $locations= $this->so->select_location($grant);
-                       $i=0;
-                       $locations[$i]['id']            = 'job';
-                       $locations[$i]['descr']         = 'Job';
-                       $i++;
-                       $locations[$i]['id']            = 'user';
-                       $locations[$i]['descr']         = 'Hrm-user';
-                       $i++;
-                       $locations[$i]['id']            = 'C-1';
-                       $locations[$i]['descr']         = 
lang('contact_information');
-                       $i++;
-                       $locations[$i]['id']            = 'C-2';
-                       $locations[$i]['descr']         = lang('photo');
-                       $i++;
-
+                       $locations= $this->so->select_location($grant);
 
+                       $i = count($locations);
                        $api_cats = $this->catbo->return_array('all', 0, True, 
False, False, 'cat_name', True);
                        if ( is_array($api_cats) )
                        {