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

Bugfix: default value for planned_arrival_date and don't overwrite dect 

Fixed registration form formatting
Fixed profile request attributes fallback values
This commit is contained in:
Igor Scheller 2019-04-25 17:30:51 +02:00 committed by msquare
parent 9930668837
commit 7c3a0c70e8
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
includes/pages/guest_login.php
View File

@ -203,7 +203,7 @@ function guest_register()
'first_name' => $preName, 'first_name' => $preName,
'last_name' => $lastName, 'last_name' => $lastName,
'shirt_size' => $tshirt_size, 'shirt_size' => $tshirt_size,
'planned_arrival_date' => Carbon::createFromTimestamp($planned_arrival_date), 'planned_arrival_date' => $enable_planned_arrival ? Carbon::createFromTimestamp($planned_arrival_date) : null,
]); ]);
$personalData->user() $personalData->user()
->associate($user) ->associate($user)
@ -303,13 +303,13 @@ function guest_register()
]) ])
]), ]),
div('row', [ div('row', [
div('col-sm-6', [ $enable_planned_arrival ? div('col-sm-6', [
$enable_planned_arrival ? form_date( form_date(
'planned_arrival_date', 'planned_arrival_date',
__('Planned date of arrival') . ' ' . entry_required(), __('Planned date of arrival') . ' ' . entry_required(),
$planned_arrival_date, $buildup_start_date, $teardown_end_date $planned_arrival_date, $buildup_start_date, $teardown_end_date
) : '' )
]), ]) : '',
div('col-sm-6', [ div('col-sm-6', [
$enable_tshirt_size ? form_select('tshirt_size', $enable_tshirt_size ? form_select('tshirt_size',
__('Shirt size') . ' ' . entry_required(), __('Shirt size') . ' ' . entry_required(),

8
includes/pages/user_settings.php
View File

@ -70,15 +70,15 @@ function user_settings_main($user_source, $enable_tshirt_size, $tshirt_sizes)
} }
// Trivia // Trivia
$user_source->personalData->last_name = strip_request_item('lastname', $user_source['Name']); $user_source->personalData->last_name = strip_request_item('lastname', $user_source->personalData->last_name);
$user_source->personalData->first_name = strip_request_item('prename', $user_source['Vorname']); $user_source->personalData->first_name = strip_request_item('prename', $user_source->personalData->first_name);
if (strlen(strip_request_item('dect')) <= 40) { if (strlen(strip_request_item('dect')) <= 40) {
$user_source->contact->dect = strip_request_item('dect', $user_source['DECT']); $user_source->contact->dect = strip_request_item('dect', $user_source->contact->dect);
} else { } else {
$valid = false; $valid = false;
error(__('For dect numbers are only 40 digits allowed.')); error(__('For dect numbers are only 40 digits allowed.'));
} }
$user_source->contact->mobile = strip_request_item('mobile', $user_source['Handy']); $user_source->contact->mobile = strip_request_item('mobile', $user_source->contact->mobile);
if ($valid) { if ($valid) {
$user_source->save(); $user_source->save();