Skip to content
Snippets Groups Projects
Commit 718e7331 authored by David Siegfried's avatar David Siegfried
Browse files

prevent php-errors on public-booking-plans, refs #1339 

Merge request studip/studip!875
parent fd49ac1d
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
app/controllers/room_management/overview.php
+ 26
− 23
View file @ 718e7331
...@@ -37,30 +37,33 @@ class RoomManagement_OverviewController extends AuthenticatedController ...@@ -37,30 +37,33 @@ class RoomManagement_OverviewController extends AuthenticatedController
} }
parent::before_filter($action, $args); parent::before_filter($action, $args);
$this->user = User::findCurrent(); $this->user = User::findCurrent();
$this->show_resource_actions = (
ResourceManager::userHasGlobalPermission($this->user, 'autor')
||
ResourceManager::userHasResourcePermissions($this->user, 'autor')
);
$this->show_admin_actions = ( if ($this->user) {
$this->user_is_global_resource_admin $this->show_resource_actions = (
|| ResourceManager::userHasGlobalPermission($this->user, 'autor')
ResourceManager::userHasResourcePermissions($this->user) ||
|| ResourceManager::userHasResourcePermissions($this->user, 'autor')
$GLOBALS['perm']->have_perm('root') );
);
$this->user_is_global_resource_user = ResourceManager::userHasGlobalPermission($this->user); $this->show_admin_actions = (
$this->user_is_root = $GLOBALS['perm']->have_perm('root'); $this->user_is_global_resource_admin
$this->user_is_global_resource_admin = ResourceManager::userHasGlobalPermission( ||
$this->user, ResourceManager::userHasResourcePermissions($this->user)
'admin' ||
) || $this->user_is_root; $GLOBALS['perm']->have_perm('root')
$this->show_global_admin_actions = $this->user_is_global_resource_admin );
&& ResourceManager::userHasGlobalPermission( $this->user_is_global_resource_user = ResourceManager::userHasGlobalPermission($this->user);
$this->user, $this->user_is_root = $GLOBALS['perm']->have_perm('root');
'admin' $this->user_is_global_resource_admin = ResourceManager::userHasGlobalPermission(
); $this->user,
'admin'
) || $this->user_is_root;
$this->show_global_admin_actions = $this->user_is_global_resource_admin
&& ResourceManager::userHasGlobalPermission(
$this->user,
'admin'
);
}
} }
public function index_action() public function index_action()
......
app/views/resources/_common/_grouped_room_list.php
+ 14
− 12
View file @ 718e7331
...@@ -61,18 +61,20 @@ ...@@ -61,18 +61,20 @@
</a> </a>
</td> </td>
<td class="actions"> <td class="actions">
<? <? if ($user) :?>
$perms = [ <?
'show_global_admin_actions' => $show_global_admin_actions, $perms = [
'show_admin_actions' => $resource->userHasPermission($user, 'admin'), 'show_global_admin_actions' => $show_global_admin_actions,
'show_tutor_actions' => $resource->userHasPermission($user, 'tutor'), 'show_admin_actions' => $resource->userHasPermission($user, 'admin'),
'show_autor_actions' => $resource->userHasPermission($user, 'autor'), 'show_tutor_actions' => $resource->userHasPermission($user, 'tutor'),
'show_user_actions' => $resource->userHasPermission($user, 'user'), 'show_autor_actions' => $resource->userHasPermission($user, 'autor'),
'user_has_booking_rights' => $resource->userHasBookingRights($user)]; 'show_user_actions' => $resource->userHasPermission($user, 'user'),
?> 'user_has_booking_rights' => $resource->userHasBookingRights($user)];
<?= $this->render_partial('resources/_common/_action_menu.php', ?>
compact('resource') + $perms <?= $this->render_partial('resources/_common/_action_menu.php',
);?> compact('resource') + $perms
)?>
<? endif ?>
</td> </td>
</tr> </tr>
<? endforeach ?> <? endforeach ?>
......
app/views/room_management/overview/public_booking_plans.php
+ 1
− 1
View file @ 718e7331
<?= $this->render_partial( <?= $this->render_partial(
'resources/_common/_grouped_room_list.php', 'resources/_common/_grouped_room_list.php',
['grouped_rooms' => $grouped_rooms] ['grouped_rooms' => $grouped_rooms, 'user' => $user]
) ?> ) ?>
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment