From dfdcc50cf39407ccd3461c0771ab5b1048be18c0 Mon Sep 17 00:00:00 2001 From: Arthur Schiwon Date: Mon, 22 Apr 2024 16:37:26 +0200 Subject: [PATCH] fix(Contexts): show sharees` displayname in edit modal Signed-off-by: Arthur Schiwon --- lib/Db/ContextMapper.php | 10 +++++++--- src/modules/modals/EditContext.vue | 2 +- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/lib/Db/ContextMapper.php b/lib/Db/ContextMapper.php index 964e3d515..15959e767 100644 --- a/lib/Db/ContextMapper.php +++ b/lib/Db/ContextMapper.php @@ -6,6 +6,7 @@ use OCA\Tables\AppInfo\Application; use OCA\Tables\Errors\NotFoundError; +use OCA\Tables\Helper\GroupHelper; use OCA\Tables\Helper\UserHelper; use OCP\AppFramework\Db\QBMapper; use OCP\DB\Exception; @@ -15,10 +16,8 @@ /** @template-extends QBMapper */ class ContextMapper extends QBMapper { protected string $table = 'tables_contexts_context'; - private UserHelper $userHelper; - public function __construct(IDBConnection $db, UserHelper $userHelper) { - $this->userHelper = $userHelper; + public function __construct(IDBConnection $db, protected UserHelper $userHelper, protected GroupHelper $groupHelper) { parent::__construct($db, $this->table, Context::class); } @@ -86,6 +85,11 @@ protected function formatResultRows(array $rows, ?string $userId) { 'share_id' => (int)$item['share_id'], 'receiver' => $item['receiver'], 'receiver_type' => $item['receiver_type'], + 'receiver_display_name' => match ($item['receiver_type']) { + 'user' => $this->userHelper->getUserDisplayName($item['receiver']), + 'group' => $this->groupHelper->getGroupDisplayName($item['receiver']), + default => $item['receiver'], + }, 'display_mode_default' => (int)$item['display_mode_default'], ]; if ($userId !== null) { diff --git a/src/modules/modals/EditContext.vue b/src/modules/modals/EditContext.vue index db4f30ca6..a27036907 100644 --- a/src/modules/modals/EditContext.vue +++ b/src/modules/modals/EditContext.vue @@ -173,7 +173,7 @@ export default { const receivers = sharing.map((share) => { return { user: share.receiver, - displayName: share.receiver, + displayName: share.receiver_display_name, icon: share.receiver_type === 'user' ? 'icon-user' : 'icon-group', isUser: share.receiver_type === 'user', key: share.receiver_type + '-' + share.receiver,