iger
/
engelsystem
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fixed some smaller error messages due to null values

This commit is contained in:
Igor Scheller 2023-08-10 11:33:45 +02:00
parent 4329ee4af9
commit 29a4b244dc
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
includes/view/User_view.php
View File

@ -499,9 +499,8 @@ function User_view(
$goodie_tshirt = $goodie === GoodieType::Tshirt; $goodie_tshirt = $goodie === GoodieType::Tshirt;
$auth = auth(); $auth = auth();
$nightShiftsConfig = config('night_shifts'); $nightShiftsConfig = config('night_shifts');
$user_name = htmlspecialchars( $user_name = htmlspecialchars((string) $user_source->personalData->first_name) . ' '
$user_source->personalData->first_name . htmlspecialchars((string) $user_source->personalData->last_name);
) . ' ' . htmlspecialchars($user_source->personalData->last_name);
$myshifts_table = ''; $myshifts_table = '';
if ($its_me || $admin_user_privilege || $tshirt_admin) { if ($its_me || $admin_user_privilege || $tshirt_admin) {
$my_shifts = User_view_myshifts( $my_shifts = User_view_myshifts(

3
resources/views/pages/settings/profile.twig
View File

@ -54,9 +54,10 @@
{% if config('enable_planned_arrival') %} {% if config('enable_planned_arrival') %}
<div class="row g-4"> <div class="row g-4">
<div class="col-sm-6"> <div class="col-sm-6">
{% set planned_arrival_date = user.personalData.planned_arrival_date %}
{{ f.input('planned_arrival_date', __('settings.profile.planned_arrival_date'), { {{ f.input('planned_arrival_date', __('settings.profile.planned_arrival_date'), {
'type': 'date', 'type': 'date',
'value': user.personalData.planned_arrival_date.format('Y-m-d'), 'value': planned_arrival_date ? planned_arrival_date.format('Y-m-d') : '',
'required': true, 'required': true,
'required_icon': true, 'required_icon': true,
'min': config('buildup_start') ? config('buildup_start').format('Y-m-d') : '', 'min': config('buildup_start') ? config('buildup_start').format('Y-m-d') : '',