From 3c5408b59212f11e92c94b41827a36fb79c59fba Mon Sep 17 00:00:00 2001
From: Alexander Purr <purr@ub.uni-leipzig.de>
Date: Mon, 4 May 2020 16:37:11 +0200
Subject: [PATCH] refs #17451 [fid] catch deleted users at order list
---
themes/fid/languages/fid/de.ini | 1 +
themes/fid/languages/fid/en.ini | 1 +
themes/fid/templates/fid/user/admin-orders.phtml | 7 +++++--
3 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/themes/fid/languages/fid/de.ini b/themes/fid/languages/fid/de.ini
index d0ffa82fed4..2459aaded65 100644
--- a/themes/fid/languages/fid/de.ini
+++ b/themes/fid/languages/fid/de.ini
@@ -121,6 +121,7 @@ read_order_list_not_allowed = "Sie haben keine Berechtigung die Bestellliste ein
user_edit_form_title = "Nutzerdaten ändern für <em>%%username%%</em> (ID %%userid%%)"
user_edit = "Nutzer %%userid%% bearbeiten"
+user_deleted = "Gelöschter Nutzer"
permission_read_user_list = "Liste aller Nutzer einsehen"
permission_edit_user = "Daten anderer Nutzer bearbeiten"
diff --git a/themes/fid/languages/fid/en.ini b/themes/fid/languages/fid/en.ini
index c511b01b33a..d8af96da20a 100644
--- a/themes/fid/languages/fid/en.ini
+++ b/themes/fid/languages/fid/en.ini
@@ -119,6 +119,7 @@ read_order_list_not_allowed = "You are not entitled to read the order list"
user_edit_form_title = "Edit user data of <em>%%username%%</em> (ID %%userid%%)"
user_edit = "Edit user %%userid%%"
+user_deleted = "Deleted user"
permission_read_user_list = "Read list of all users"
permission_edit_user = "Edit other user's data"
diff --git a/themes/fid/templates/fid/user/admin-orders.phtml b/themes/fid/templates/fid/user/admin-orders.phtml
index c4042701c89..3caca066e03 100644
--- a/themes/fid/templates/fid/user/admin-orders.phtml
+++ b/themes/fid/templates/fid/user/admin-orders.phtml
@@ -25,8 +25,11 @@
<td>
<?php
/** @var \fid\Service\DataTransferObject\User $user */
- $user = $order->getUser(); ?>
- <?= $user->getFirstname() ?> <?= $user->getLastname() ?>
+ if ($user = $order->getUser()) : ?>
+ <?= $user->getFirstname() ?> <?= $user->getLastname() ?>
+ <?php else: ?>
+ <?= $this->translate('fid::user_deleted') ?>
+ <?php endif; ?>
</td>
<!-- fid: fid - admin - order-list - data - END -->
--
GitLab