gui: refactor render_full_name

this also fixes a missing  htmlEncode in UserSelector

Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>

diff --git a/www/manager6/Utils.js b/www/manager6/Utils.js
index 49b5786a5152352fb3e0c6085882ec9c7485ca8b..a190a7ab9d9616a2c78183cfe187077ebc043fdd 100644 (file)
--- a/www/manager6/Utils.js
+++ b/www/manager6/Utils.js
@@ -806,6 +806,12 @@ Ext.define('PVE.Utils', { utilities: {
        return value;
     },
 
+    render_full_name: function(firstname, metaData, record) {
+       var first = firstname || '';
+       var last = record.data.lastname || '';
+       return Ext.htmlEncode(first + " " + last);
+    },
+
     windowHostname: function() {
        return window.location.hostname.replace(Proxmox.Utils.IP6_bracket_match,
             function(m, addr, offset, original) { return addr; });

diff --git a/www/manager6/dc/UserView.js b/www/manager6/dc/UserView.js
index 5f8bed1735a0504b19fb9e53602364fdcc8e6c46..4d0c55952657b60cee851e213542ef5e0f904841 100644 (file)
--- a/www/manager6/dc/UserView.js
+++ b/www/manager6/dc/UserView.js
@@ -92,13 +92,6 @@ Ext.define('PVE.dc.UserView', {
            edit_btn, remove_btn, pwchange_btn
         ];
 
-       var render_full_name = function(firstname, metaData, record) {
-
-           var first = firstname || '';
-           var last = record.data.lastname || '';
-           return Ext.htmlEncode(first + " " + last);
-       };
-
        var render_username = function(userid) {
            return userid.match(/^(.+)(@[^@]+)$/)[1];
        };
@@ -147,7 +140,7 @@ Ext.define('PVE.dc.UserView', {
                    header: gettext('Name'),
                    width: 150,
                    sortable: true,
-                   renderer: render_full_name,
+                   renderer: PVE.Utils.render_full_name,
                    dataIndex: 'firstname'
                },
                {

diff --git a/www/manager6/form/UserSelector.js b/www/manager6/form/UserSelector.js
index 8eafe0e85ca888ed6d12ed6a3843d01b4fad604e..cd01bc3ee24bef658d90535adedfb23402672e21 100644 (file)
--- a/www/manager6/form/UserSelector.js
+++ b/www/manager6/form/UserSelector.js
@@ -21,13 +21,6 @@ Ext.define('PVE.form.UserSelector', {
            }]
        });
 
-       var render_full_name = function(firstname, metaData, record) {
-
-           var first = firstname || '';
-           var last = record.data.lastname || '';
-           return first + " " + last;
-       };
-
        Ext.apply(me, {
            store: store,
             listConfig: {
@@ -41,7 +34,7 @@ Ext.define('PVE.form.UserSelector', {
                    {
                        header: gettext('Name'),
                        sortable: true,
-                       renderer: render_full_name,
+                       renderer: PVE.Utils.render_full_name,
                        dataIndex: 'firstname',
                        flex: 1
                    },