diff options
| author | Philipp Schüttlöffel <schuettloeffel@zqs.uni-hannover.de> | 2024-09-24 10:53:31 +0200 |
|---|---|---|
| committer | Philipp Schüttlöffel <schuettloeffel@zqs.uni-hannover.de> | 2024-09-24 10:53:31 +0200 |
| commit | 4459dd7917f4d1c34f40bb68f0e991e9c3d53e4c (patch) | |
| tree | 5c07151ae61276d334e88f6309c30d439a85c12e /app/views/resources | |
| parent | da0022e5c1abbf9825ae76debaabdff7e8623bb4 (diff) | |
| parent | 97a188592c679890a25c37ab78463add76a52ff7 (diff) | |
Merge branch 'main' into issue-3911issue-3911
Diffstat (limited to 'app/views/resources')
| -rw-r--r-- | app/views/resources/_common/_grouped_room_list.php | 2 | ||||
| -rw-r--r-- | app/views/resources/_common/_room_tr.php | 2 | ||||
| -rw-r--r-- | app/views/resources/booking/_add_edit_form.php | 2 | ||||
| -rw-r--r-- | app/views/resources/room_group/permissions.php | 2 | ||||
| -rw-r--r-- | app/views/resources/room_request/decline.php | 6 |
5 files changed, 7 insertions, 7 deletions
diff --git a/app/views/resources/_common/_grouped_room_list.php b/app/views/resources/_common/_grouped_room_list.php index f3d6b62..a27af17 100644 --- a/app/views/resources/_common/_grouped_room_list.php +++ b/app/views/resources/_common/_grouped_room_list.php @@ -64,7 +64,7 @@ <? if ($user) :?> <? $perms = [ - 'show_global_admin_actions' => $show_global_admin_actions, + 'show_global_admin_actions' => $show_global_admin_actions ?? false, 'show_admin_actions' => $resource->userHasPermission($user, 'admin'), 'show_tutor_actions' => $resource->userHasPermission($user, 'tutor'), 'show_autor_actions' => $resource->userHasPermission($user, 'autor'), diff --git a/app/views/resources/_common/_room_tr.php b/app/views/resources/_common/_room_tr.php index 37f26d1..1b9f46a 100644 --- a/app/views/resources/_common/_room_tr.php +++ b/app/views/resources/_common/_room_tr.php @@ -19,7 +19,7 @@ * Defaults to false (do not show actions). * $user_has_booking_rights: Boolean: Whether the user for which this template * is rendered has booking rights on the resource (true) or not (false). - * $show_room_picture: Boolean: Whether to display the room picture or not. + * $show_picture: Boolean: Whether to display the room picture or not. * Defaults to false (do not show picture). * $additional_properties: Array: Additional properties * that shall be displayed in extra columns. diff --git a/app/views/resources/booking/_add_edit_form.php b/app/views/resources/booking/_add_edit_form.php index 571ff63..f982c37 100644 --- a/app/views/resources/booking/_add_edit_form.php +++ b/app/views/resources/booking/_add_edit_form.php @@ -537,7 +537,7 @@ <label> <input type="checkbox" value="1" name="overwrite_bookings" - <?= $overwrite_bookings ? 'checked="checked"' : '' ?>> + <?= !empty($overwrite_bookings) ? 'checked' : '' ?>> <?= _('Vorhandene Buchungen überschreiben') ?> </label> </fieldset> diff --git a/app/views/resources/room_group/permissions.php b/app/views/resources/room_group/permissions.php index 17090ce..1dd970d 100644 --- a/app/views/resources/room_group/permissions.php +++ b/app/views/resources/room_group/permissions.php @@ -28,7 +28,7 @@ <?= $this->render_partial( 'resources/resource/permissions', [ - 'custom_empty_list_message' => _('Es sind keine gemeinsamen Rechte für die oben aufgeführten Räume vorhanden.'), + 'custom_empty_list_message' => _('Es sind keine gemeinsamen Rechte für die zuvor aufgelisteten Räume vorhanden.'), 'custom_save_button_text' => _('Zuweisen'), 'custom_form_action_link' => URLHelper::getLink('dispatch.php/resources/room_group/permissions/' . $clipboard->id), 'custom_hidden_fields' => [ diff --git a/app/views/resources/room_request/decline.php b/app/views/resources/room_request/decline.php index 188c4bb..2c02126 100644 --- a/app/views/resources/room_request/decline.php +++ b/app/views/resources/room_request/decline.php @@ -30,7 +30,7 @@ <? endif ?> <? endif ?> <footer data-dialog-button> - <? if ($prev_request) : ?> + <? if (!empty($prev_request)) : ?> <?= \Studip\LinkButton::create( _('Vorherige Anfrage'), $controller->declineURL($prev_request), @@ -45,7 +45,7 @@ <? if ($show_form) : ?> <?= \Studip\Button::createAccept($delete_mode ? _('Löschen') : _('Ablehnen'), 'confirm') ?> <? endif ?> - <? if ($next_request) : ?> + <? if (!empty($next_request)) : ?> <?= \Studip\LinkButton::create( _('Nächste Anfrage'), $controller->declineURL($next_request), @@ -53,4 +53,4 @@ ) ?> <? endif ?> </footer> -</form>
\ No newline at end of file +</form> |