fix angeltype edit and display bugs
This commit is contained in:
parent
4effb7e59f
commit
5cffcd7fdf
|
@ -127,7 +127,7 @@ function angeltype_edit_controller()
|
|||
|
||||
if (!$supporter_mode) {
|
||||
if ($request->has('name')) {
|
||||
$result = AngelType_validate_name($request->get('name'), $angeltype);
|
||||
$result = AngelType_validate_name($request->input('name'), $angeltype);
|
||||
$angeltype['name'] = $result->getValue();
|
||||
if (!$result->isValid()) {
|
||||
$valid = false;
|
||||
|
|
|
@ -246,6 +246,7 @@ function Users_by_angeltype($angeltype)
|
|||
`UserAngelTypes`.`id` AS `user_angeltype_id`,
|
||||
`UserAngelTypes`.`confirm_user_id`,
|
||||
`UserAngelTypes`.`supporter`,
|
||||
(`UserDriverLicenses`.`user_id` IS NOT NULL) as `wants_to_drive`,
|
||||
`UserDriverLicenses`.*
|
||||
FROM `User`
|
||||
JOIN `UserAngelTypes` ON `User`.`UID`=`UserAngelTypes`.`user_id`
|
||||
|
|
|
@ -180,7 +180,6 @@ function AngelType_view_members($angeltype, $members, $admin_user_angeltypes, $a
|
|||
$members_unconfirmed = [];
|
||||
foreach ($members as $member) {
|
||||
$member['Nick'] = User_Nick_render($member);
|
||||
|
||||
if ($angeltype['requires_driver_license']) {
|
||||
$member['wants_to_drive'] = glyph_bool($member['wants_to_drive']);
|
||||
$member['has_car'] = glyph_bool($member['has_car']);
|
||||
|
|
Loading…
Reference in New Issue