Skip to content
Snippets Groups Projects
Commit 6e7632d1 authored by André Noack's avatar André Noack
Browse files

Resolve #2856 "Belegungspläne sind für Stud.IP Benutzer nur sichtbar, wenn...

Resolve #2856  "Belegungspläne sind für Stud.IP Benutzer nur sichtbar, wenn die Pläne auch öffentlich gemacht werden"

Closes #2856

Merge request studip/studip!1974
parent d91899f2
No related branches found
No related tags found
No related merge requests found
...@@ -1148,11 +1148,6 @@ class Resources_AdminController extends AuthenticatedController ...@@ -1148,11 +1148,6 @@ class Resources_AdminController extends AuthenticatedController
'RESOURCES_ENABLE', 'RESOURCES_ENABLE',
(bool)Request::get('resources_enable') (bool)Request::get('resources_enable')
); );
$this->config->store(
'RESOURCES_ALLOW_VIEW_RESOURCE_OCCUPATION',
(bool)Request::get('resources_allow_view_resource_occupation')
);
$this->config->store( $this->config->store(
'RESOURCES_ALLOW_ROOM_PROPERTY_REQUESTS', 'RESOURCES_ALLOW_ROOM_PROPERTY_REQUESTS',
(bool)Request::get('resources_allow_room_property_requests') (bool)Request::get('resources_allow_room_property_requests')
......
...@@ -14,14 +14,6 @@ ...@@ -14,14 +14,6 @@
</fieldset> </fieldset>
<fieldset> <fieldset>
<legend><?= _('Anzeigeoptionen') ?></legend> <legend><?= _('Anzeigeoptionen') ?></legend>
<label>
<input type="checkbox" name="resources_allow_view_resource_occupation"
value="1"
<?= $config->RESOURCES_ALLOW_VIEW_RESOURCE_OCCUPATION == '1'
? 'checked="checked"'
: ''?>>
<?= _('Belegungen sind sichtbar für alle Nutzer') ?>
</label>
<? if ($colours): ?> <? if ($colours): ?>
<? foreach ($colours as $colour): ?> <? foreach ($colours as $colour): ?>
<label> <label>
......
...@@ -47,8 +47,7 @@ ...@@ -47,8 +47,7 @@
Icon::create('info-circle'), Icon::create('info-circle'),
['data-dialog' => ''] ['data-dialog' => '']
); );
if (($room->booking_plan_is_public && Config::get()->RESOURCES_SHOW_PUBLIC_ROOM_PLANS) if ($room->bookingPlanVisibleForUser($current_user)) {
|| ($room->userHasPermission($current_user, 'autor'))) {
$actions->addLink( $actions->addLink(
$room->getActionURL('booking_plan', $booking_plan_action_params), $room->getActionURL('booking_plan', $booking_plan_action_params),
( (
......
<?php
/**
* @see https://gitlab.studip.de/studip/studip/-/issues/2856
*/
final class FixForBiest2856 extends Migration
{
public function description()
{
return 'Removes the obsolete configuration RESOURCES_ALLOW_VIEW_RESOURCE_OCCUPATION';
}
protected function up()
{
$query = "DELETE `config`, `config_values`
FROM `config`
LEFT JOIN `config_values` USING (`field`)
WHERE `field` = 'RESOURCES_ALLOW_VIEW_RESOURCE_OCCUPATION'";
DBManager::get()->exec($query);
}
protected function down()
{
$query = "INSERT INTO `config` (`field`, `value`, `type`, `range`, `section`, `mkdate`, `chdate`, `description`)
VALUES ('RESOURCES_ALLOW_VIEW_RESOURCE_OCCUPATION', '1', 'boolean', 'global', 'resources', UNIX_TIMESTAMP(), UNIX_TIMESTAMP(), 'Dürfen alle Nutzer Ressourcenbelegungen einsehen?')";
DBManager::get()->exec($query);
}
}
...@@ -647,8 +647,8 @@ class Room extends Resource ...@@ -647,8 +647,8 @@ class Room extends Resource
*/ */
public function bookingPlanVisibleForUser(?User $user, $time_range = []) public function bookingPlanVisibleForUser(?User $user, $time_range = [])
{ {
return parent::bookingPlanVisibleForUser($user, $time_range) return $this->booking_plan_is_public
|| $this->booking_plan_is_public && Config::get()->RESOURCES_SHOW_PUBLIC_ROOM_PLANS; || parent::bookingPlanVisibleForUser($user, $time_range);
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment