From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <d.csapak@proxmox.com>
Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (2048 bits))
(No client certificate requested)
by lists.proxmox.com (Postfix) with ESMTPS id 6256D68CF3
for <pbs-devel@lists.proxmox.com>; Wed, 11 Nov 2020 13:34:46 +0100 (CET)
Received: from firstgate.proxmox.com (localhost [127.0.0.1])
by firstgate.proxmox.com (Proxmox) with ESMTP id 3DE392BED7
for <pbs-devel@lists.proxmox.com>; Wed, 11 Nov 2020 13:34:16 +0100 (CET)
Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com
[212.186.127.180])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (2048 bits))
(No client certificate requested)
by firstgate.proxmox.com (Proxmox) with ESMTPS id B206F2BEC6
for <pbs-devel@lists.proxmox.com>; Wed, 11 Nov 2020 13:34:15 +0100 (CET)
Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1])
by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 7132045DA6
for <pbs-devel@lists.proxmox.com>; Wed, 11 Nov 2020 13:34:15 +0100 (CET)
From: Dominik Csapak <d.csapak@proxmox.com>
To: pbs-devel@lists.proxmox.com
Date: Wed, 11 Nov 2020 13:34:14 +0100
Message-Id: <20201111123414.19657-2-d.csapak@proxmox.com>
X-Mailer: git-send-email 2.20.1
In-Reply-To: <20201111123414.19657-1-d.csapak@proxmox.com>
References: <20201111123414.19657-1-d.csapak@proxmox.com>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
X-SPAM-LEVEL: Spam detection results: 0
AWL 0.374 Adjusted score from AWL reputation of From: address
KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment
RCVD_IN_DNSWL_MED -2.3 Sender listed at https://www.dnswl.org/,
medium trust
SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record
SPF_PASS -0.001 SPF: sender matches SPF record
Subject: [pbs-devel] [PATCH proxmox-backup 2/2] ui: UserView: render name as
'Firstname Lastname'
X-BeenThere: pbs-devel@lists.proxmox.com
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: Proxmox Backup Server development discussion
<pbs-devel.lists.proxmox.com>
List-Unsubscribe: <https://lists.proxmox.com/cgi-bin/mailman/options/pbs-devel>,
<mailto:pbs-devel-request@lists.proxmox.com?subject=unsubscribe>
List-Archive: <http://lists.proxmox.com/pipermail/pbs-devel/>
List-Post: <mailto:pbs-devel@lists.proxmox.com>
List-Help: <mailto:pbs-devel-request@lists.proxmox.com?subject=help>
List-Subscribe: <https://lists.proxmox.com/cgi-bin/mailman/listinfo/pbs-devel>,
<mailto:pbs-devel-request@lists.proxmox.com?subject=subscribe>
X-List-Received-Date: Wed, 11 Nov 2020 12:34:46 -0000
instead of only the firstname
Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
---
www/config/UserView.js | 12 ++++++++++++
1 file changed, 12 insertions(+)
diff --git a/www/config/UserView.js b/www/config/UserView.js
index c2556b97..f030b30c 100644
--- a/www/config/UserView.js
+++ b/www/config/UserView.js
@@ -76,6 +76,17 @@ Ext.define('PBS.config.UserView', {
}).show();
},
+ renderName: function(val, cell, rec) {
+ let name = [];
+ if (rec.data.firstname) {
+ name.push(rec.data.firstname);
+ }
+ if (rec.data.lastname) {
+ name.push(rec.data.lastname);
+ }
+ return name.join(' ');
+ },
+
renderUsername: function(userid) {
return Ext.String.htmlEncode(userid.match(/^(.+)@([^@]+)$/)[1]);
},
@@ -181,6 +192,7 @@ Ext.define('PBS.config.UserView', {
width: 150,
sortable: true,
dataIndex: 'firstname',
+ renderer: 'renderName',
},
{
header: gettext('Comment'),
--
2.20.1