diff options
Diffstat (limited to 'app')
| -rw-r--r-- | app/controllers/resources/ajax.php | 6 | ||||
| -rw-r--r-- | app/controllers/resources/room_planning.php | 25 |
2 files changed, 2 insertions, 29 deletions
diff --git a/app/controllers/resources/ajax.php b/app/controllers/resources/ajax.php index ebe0e10..18b3b4d 100644 --- a/app/controllers/resources/ajax.php +++ b/app/controllers/resources/ajax.php @@ -328,16 +328,10 @@ class Resources_AjaxController extends AuthenticatedController throw new AccessDeniedException(); } } - $user_is_resource_user = $current_user && $resource->userHasPermission($current_user); $display_requests = $current_user && Request::bool('display_requests'); $display_all_requests = Request::bool('display_all_requests'); - if ($display_all_requests && !$user_is_resource_user) { - //The user is not allowed to see all requests. - throw new AccessDeniedException(); - } - $begin_date = Request::get('start'); $end_date = Request::get('end'); if (!$begin_date || !$end_date) { diff --git a/app/controllers/resources/room_planning.php b/app/controllers/resources/room_planning.php index d90aa4a..b06e166 100644 --- a/app/controllers/resources/room_planning.php +++ b/app/controllers/resources/room_planning.php @@ -142,10 +142,7 @@ class Resources_RoomPlanningController extends AuthenticatedController if ($this->resource->requestable) { $this->display_all_requests = Request::bool( 'display_all_requests', - $this->resource->userHasPermission( - $this->user, - 'autor' - ) + Config::get()->RESOURCES_ALLOW_ROOM_REQUESTS ); } else { $this->display_all_requests = false; @@ -161,23 +158,12 @@ class Resources_RoomPlanningController extends AuthenticatedController ResourceBooking::TYPE_RESERVATION, ResourceBooking::TYPE_LOCK, ]; + $plan_is_visible = $this->resource->bookingPlanVisibleForUser($this->user); if ($this->user instanceof User) { - if ($this->display_all_requests) { - $plan_is_visible = $this->resource->userHasPermission( - $this->user, - 'autor' - ); - } else { - $plan_is_visible = $this->resource->bookingPlanVisibleForUser($this->user); - } $this->anonymous_view = false; if ($this->resource->userHasPermission($this->user, 'admin')) { $this->booking_types[] = ResourceBooking::TYPE_PLANNED; } - } else { - //If the plan visibility cannot be determined by the user, - //we can still check if the plan is visible to the public: - $plan_is_visible = $this->resource->bookingPlanVisibleForUser($this->user); } if (!$plan_is_visible) { throw new AccessDeniedException( @@ -192,13 +178,6 @@ class Resources_RoomPlanningController extends AuthenticatedController $this->user_has_booking_permissions = $this->resource->userHasBookingRights($this->user); } - if (!$this->user_has_booking_permissions && $this->display_all_requests) { - throw new AccessDeniedException( - _('Sie sind nicht dazu berechtigt, alle Anfragen im Belegungsplan zu sehen!') - ); - } - - $week_timestamp = Request::int('timestamp'); $default_date = Request::get('defaultDate'); $this->date = new DateTime(); |