Skip to content
Snippets Groups Projects
Commit 7bf2360c authored by David Siegfried's avatar David Siegfried Committed by Jan-Hendrik Willms
Browse files

hide request-buttons for user without permissions, closes #1270 

Closes #1270

Merge request studip/studip!877
parent 0cce80ec
No related branches found
No related tags found
No related merge requests found
Show whitespace changes
Inline Side-by-side
app/controllers/resources/room.php
+ 13
− 17
View file @ 7bf2360c
...@@ -33,6 +33,7 @@ class Resources_RoomController extends AuthenticatedController ...@@ -33,6 +33,7 @@ class Resources_RoomController extends AuthenticatedController
public function index_action($room_id = null) public function index_action($room_id = null)
{ {
$this->user = User::findCurrent();
$this->room = Room::find($room_id); $this->room = Room::find($room_id);
if (!$this->room) { if (!$this->room) {
...@@ -54,20 +55,12 @@ class Resources_RoomController extends AuthenticatedController ...@@ -54,20 +55,12 @@ class Resources_RoomController extends AuthenticatedController
Navigation::activateItem('/room_management/overview/index'); Navigation::activateItem('/room_management/overview/index');
} }
$user = User::findCurrent(); $this->current_user_is_resource_admin = $this->room->userHasPermission($this->user, 'admin');
$current_user_is_resource_admin = $this->room->userHasPermission( $current_user_is_resource_tutor = $this->room->userHasPermission($this->user, 'tutor');
$user, $this->current_user_is_resource_autor = $this->room->userHasPermission($this->user, 'autor');
'admin' $this->current_user_has_request_rights = $this->room->userHasRequestRights($this->user);
); $current_user_is_resource_user = $this->room->userHasPermission($this->user);
$current_user_is_resource_tutor = $this->room->userHasPermission( $this->booking_plan_is_visible = $this->room->bookingPlanVisibleForUser($this->user);
$user,
'tutor'
);
$this->current_user_is_resource_autor = $this->room->userHasPermission(
$user,
'autor'
);
$current_user_is_resource_user = $this->room->userHasPermission($user);
$sidebar = Sidebar::get(); $sidebar = Sidebar::get();
$actions = new ActionsWidget(); $actions = new ActionsWidget();
...@@ -92,7 +85,7 @@ class Resources_RoomController extends AuthenticatedController ...@@ -92,7 +85,7 @@ class Resources_RoomController extends AuthenticatedController
'target' => '_blank' 'target' => '_blank'
] ]
); );
} elseif ($this->room->bookingPlanVisibleForUser($user)) { } elseif ($this->booking_plan_is_visible) {
$actions_available = true; $actions_available = true;
$actions->addLink( $actions->addLink(
_('Belegungsplan'), _('Belegungsplan'),
...@@ -111,7 +104,7 @@ class Resources_RoomController extends AuthenticatedController ...@@ -111,7 +104,7 @@ class Resources_RoomController extends AuthenticatedController
] ]
); );
} }
if ($current_user_is_resource_admin) { if ($this->current_user_is_resource_admin) {
$actions_available = true; $actions_available = true;
$actions->addLink( $actions->addLink(
_('Raum bearbeiten'), _('Raum bearbeiten'),
...@@ -142,7 +135,10 @@ class Resources_RoomController extends AuthenticatedController ...@@ -142,7 +135,10 @@ class Resources_RoomController extends AuthenticatedController
); );
} }
} }
if (!$this->current_user_is_resource_autor && $this->room->requestable) { if (!$this->current_user_is_resource_autor
&& $this->room->requestable
&& $this->current_user_has_request_rights
) {
$actions_available = true; $actions_available = true;
$actions->addLink( $actions->addLink(
_('Raum anfragen'), _('Raum anfragen'),
......
app/views/resources/room/index.php
+ 4
− 5
View file @ 7bf2360c
...@@ -69,7 +69,7 @@ ...@@ -69,7 +69,7 @@
<? endif ?> <? endif ?>
<footer data-dialog-button> <footer data-dialog-button>
<? if ($room->userHasPermission(User::findCurrent(), 'autor')) : ?> <? if ($current_user_is_resource_autor) : ?>
<?= \Studip\LinkButton::create( <?= \Studip\LinkButton::create(
_('Wochenbelegung'), _('Wochenbelegung'),
$room->getActionURL('booking_plan') $room->getActionURL('booking_plan')
...@@ -78,7 +78,7 @@ ...@@ -78,7 +78,7 @@
_('Semesterbelegung'), _('Semesterbelegung'),
$room->getActionURL('semester_plan') $room->getActionURL('semester_plan')
) ?> ) ?>
<? elseif ($room->bookingPlanVisibleForUser(User::findCurrent())) : ?> <? elseif ($booking_plan_is_visible) : ?>
<?= \Studip\LinkButton::create( <?= \Studip\LinkButton::create(
_('Belegungsplan'), _('Belegungsplan'),
$room->getActionURL('booking_plan') $room->getActionURL('booking_plan')
...@@ -97,7 +97,7 @@ ...@@ -97,7 +97,7 @@
) )
) ?> ) ?>
<? endif ?> <? endif ?>
<? if ($room->userHasPermission(User::findCurrent(), 'admin')) : ?> <? if ($current_user_is_resource_admin) : ?>
<?= \Studip\LinkButton::createEdit( <?= \Studip\LinkButton::createEdit(
_('Bearbeiten'), _('Bearbeiten'),
$room->getActionURL('edit'), $room->getActionURL('edit'),
...@@ -106,11 +106,10 @@ ...@@ -106,11 +106,10 @@
] ]
) ?> ) ?>
<? endif ?> <? endif ?>
<? if (!$current_user_is_resource_autor && $room->requestable) : ?> <? if (!$current_user_is_resource_autor && $room->requestable && $current_user_has_request_rights) : ?>
<?= \Studip\LinkButton::create( <?= \Studip\LinkButton::create(
_('Raum anfragen'), _('Raum anfragen'),
$room->getActionURL('request'), $room->getActionURL('request'),
['data-dialog' => 'size=auto']) ?> ['data-dialog' => 'size=auto']) ?>
<? endif ?> <? endif ?>
</footer> </footer>
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment