[Fmsystem-commits] [6668] bkbooking: bugfix massbooking removed unnessesary permission check

[Kjell Arne Espedal]

Revision: 6668
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=6668
Author:   kjell
Date:     2010-12-10 13:57:08 +0000 (Fri, 10 Dec 2010)
Log Message:
-----------
bkbooking: bugfix massbooking removed unnessesary permission check

Modified Paths:
--------------
    trunk/booking/inc/class.bomassbooking.inc.php
    trunk/booking/inc/class.uimassbooking.inc.php

Modified: trunk/booking/inc/class.bomassbooking.inc.php
===================================================================
--- trunk/booking/inc/class.bomassbooking.inc.php       2010-12-09 19:32:09 UTC 
(rev 6667)
+++ trunk/booking/inc/class.bomassbooking.inc.php       2010-12-10 13:57:08 UTC 
(rev 6668)
@@ -1,7 +1,7 @@
 <?php
-       phpgw::import_class('booking.bocommon_authorized');
+       phpgw::import_class('booking.bocommon');
        
-       class booking_bomassbooking extends booking_bocommon_authorized
+       class booking_bomassbooking extends booking_bocommon
        {
                function __construct()
                {
@@ -9,50 +9,6 @@
                        $this->so = CreateObject('booking.somassbooking');
                }
                
-               protected function get_object_role_permissions(array 
$forObject, $defaultPermissions)
-               {
-                       return array_merge(
-                               array
-                               (
-                                       booking_sopermission::ROLE_MANAGER => 
array
-                                       (
-                                               'write' => true,
-                                       ),
-                                       booking_sopermission::ROLE_CASE_OFFICER 
=> array
-                                       (
-                                               'write' => 
array_fill_keys(array('name', 'homepage', 'description', 'email', 'phone', 
'street', 'zip_code', 'city', 'district'), true),
-                                       ),
-                                       'global' => array
-                                       (
-                                               
booking_sopermission::ROLE_MANAGER => array
-                                               (
-                                                       'read' => true,
-                                                       'write' => true,
-                                                       'create' => true,
-                                                       'delete' => true,
-                                               ),
-                                       )
-                               ),
-                               $defaultPermissions
-                       );
-               }
-               
-               protected function 
get_collection_role_permissions($defaultPermissions)
-               {
-                       return array_merge(
-                               array(
-                                       'global' => array
-                                       (
-                                               
booking_sopermission::ROLE_MANAGER => array
-                                               (
-                                                       'create' => true, 
#means that this role may create new objects of the present type
-                                                       'delete' => true,
-                                               ),
-                                       ),
-                               ),
-                               $defaultPermissions
-                       );
-               }
 
                public function get_schedule($id, $module)
                {

Modified: trunk/booking/inc/class.uimassbooking.inc.php
===================================================================
--- trunk/booking/inc/class.uimassbooking.inc.php       2010-12-09 19:32:09 UTC 
(rev 6667)
+++ trunk/booking/inc/class.uimassbooking.inc.php       2010-12-10 13:57:08 UTC 
(rev 6668)
@@ -22,11 +22,9 @@
                {
                        parent::__construct();
                        
-                       self::process_booking_unauthorized_exceptions();
                        
                        $this->bo = CreateObject('booking.bomassbooking');
                        
self::set_active_menu('booking::applications::massboooking');
-                       $this->fields = array('name', 'homepage', 
'description', 'email', 'street', 'zip_code', 'city', 'district', 'phone', 
'active', 'location_code');
                }
                                
                public function index()