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

fixes #4210

Closes #4210

Merge request studip/studip!3040
parent e82be6c8
No related branches found
No related tags found
No related merge requests found
...@@ -1352,7 +1352,7 @@ class Resources_BookingController extends AuthenticatedController ...@@ -1352,7 +1352,7 @@ class Resources_BookingController extends AuthenticatedController
$resource, $resource,
$time_intervals, $time_intervals,
[1, 3], [1, 3],
($this->booking->id ? [$this->booking->id] : []) isset($this->booking->id) ? [$this->booking->id] : []
); );
$reservations_to_overwrite = array_merge( $reservations_to_overwrite = array_merge(
$reservations_to_overwrite, $reservations_to_overwrite,
......
...@@ -85,12 +85,14 @@ use Studip\Button; ...@@ -85,12 +85,14 @@ use Studip\Button;
</td> </td>
<td> <td>
<input type="radio" <input type="radio"
name="lockdata_attributes[<?= $attr ?>]" <?= ($lock_rule['attributes'][$attr] ? 'checked' : '') ?> name="lockdata_attributes[<?= $attr ?>]"
value="1"/> <?= !empty($lock_rule['attributes'][$attr]) ? 'checked' : '' ?>
value="1">
</td> </td>
<td> <td>
<input type="radio" <input type="radio"
name="lockdata_attributes[<?= $attr ?>]" <?= (!$lock_rule['attributes'][$attr] ? 'checked' : '') ?> name="lockdata_attributes[<?= $attr ?>]"
<?= empty($lock_rule['attributes'][$attr]) ? 'checked' : '' ?>
value="0"/> value="0"/>
</td> </td>
</tr> </tr>
......
...@@ -537,7 +537,7 @@ ...@@ -537,7 +537,7 @@
<label> <label>
<input type="checkbox" value="1" <input type="checkbox" value="1"
name="overwrite_bookings" name="overwrite_bookings"
<?= $overwrite_bookings ? 'checked="checked"' : '' ?>> <?= !empty($overwrite_bookings) ? 'checked' : '' ?>>
<?= _('Vorhandene Buchungen überschreiben') ?> <?= _('Vorhandene Buchungen überschreiben') ?>
</label> </label>
</fieldset> </fieldset>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment