From 16478377ac8dd9fb04912490445cfb5cd4cdeabe Mon Sep 17 00:00:00 2001 From: Tobias Klika Date: Mon, 11 May 2020 11:40:13 +0200 Subject: [PATCH] output correct avatar in list --- zero.Web/App/pages/settings/users.vue | 5 +++-- zero.Web/Mapper/UserMapperConfig.cs | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/zero.Web/App/pages/settings/users.vue b/zero.Web/App/pages/settings/users.vue index 47db5d0f..2b261913 100644 --- a/zero.Web/App/pages/settings/users.vue +++ b/zero.Web/App/pages/settings/users.vue @@ -51,9 +51,10 @@ avatar: { label: '', as: 'html', - render: item => ``, + render: item => ``, width: 70, - link: this.getUserLink + link: this.getUserLink, + sort: false }, name: { label: '@ui.name', diff --git a/zero.Web/Mapper/UserMapperConfig.cs b/zero.Web/Mapper/UserMapperConfig.cs index 5a079237..9f8bb28f 100644 --- a/zero.Web/Mapper/UserMapperConfig.cs +++ b/zero.Web/Mapper/UserMapperConfig.cs @@ -49,7 +49,7 @@ namespace zero.Web.Mapper target.Name = source.Name; target.IsActive = source.IsActive && (!source.LockoutEnabled || !source.LockoutEnd.HasValue); target.Email = source.Email; - target.Avatar = "https://fifty.brothers.studio/Media/Avatars/tobi.jpg"; // TODO //source.Avatar?.Source; + target.Avatar = source.Avatar?.Source; target.Roles = String.Join(", ", source.Roles); // TODO get name from alias });