From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: 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 4A81A62319 for ; Tue, 29 Sep 2020 16:19:04 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 40511109F9 for ; Tue, 29 Sep 2020 16:19:04 +0200 (CEST) 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 2E232109E9 for ; Tue, 29 Sep 2020 16:19:03 +0200 (CEST) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id E4AAC45846 for ; Tue, 29 Sep 2020 16:19:02 +0200 (CEST) From: Dominik Csapak To: pbs-devel@lists.proxmox.com Date: Tue, 29 Sep 2020 16:18:59 +0200 Message-Id: <20200929141859.17102-3-d.csapak@proxmox.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200929141859.17102-1-d.csapak@proxmox.com> References: <20200929141859.17102-1-d.csapak@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL -0.153 Adjusted score from AWL reputation of From: address KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment KAM_LAZY_DOMAIN_SECURITY 1 Sending domain does not have any anti-forgery methods NO_DNS_FOR_FROM 0.379 Envelope sender has no MX or A DNS records 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_NONE 0.001 SPF: sender does not publish an SPF Record URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [data.host] Subject: [pbs-devel] [RFC PATCH proxmox-backup 2/2] ui: add port support for remotes X-BeenThere: pbs-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox Backup Server development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 29 Sep 2020 14:19:04 -0000 by adding a field to RemoteEdit and showing it in the grid Signed-off-by: Dominik Csapak --- www/config/RemoteView.js | 13 +++++++++++-- www/window/RemoteEdit.js | 10 ++++++++++ 2 files changed, 21 insertions(+), 2 deletions(-) diff --git a/www/config/RemoteView.js b/www/config/RemoteView.js index a820da04..a804e5d6 100644 --- a/www/config/RemoteView.js +++ b/www/config/RemoteView.js @@ -1,6 +1,15 @@ Ext.define('pmx-remotes', { extend: 'Ext.data.Model', - fields: ['name', 'host', 'userid', 'fingerprint', 'comment'], + fields: ['name', 'host', 'port', 'userid', 'fingerprint', 'comment', + { + name: 'server', + calculate: function(data) { + let host = data.host || "localhost"; + let port = data.port || "8007"; + return `${host}:${port}`; + } + } + ], idProperty: 'name', proxy: { type: 'proxmox', @@ -109,7 +118,7 @@ Ext.define('PBS.config.RemoteView', { header: gettext('Host'), width: 200, sortable: true, - dataIndex: 'host', + dataIndex: 'server', }, { header: gettext('User name'), diff --git a/www/window/RemoteEdit.js b/www/window/RemoteEdit.js index cbfbe1d9..7d0ea546 100644 --- a/www/window/RemoteEdit.js +++ b/www/window/RemoteEdit.js @@ -48,6 +48,16 @@ Ext.define('PBS.window.RemoteEdit', { name: 'host', fieldLabel: gettext('Host'), }, + { + xtype: 'proxmoxintegerfield', + allowBlank: true, + minValue: 1, + maxValue: 2**16, + name: 'port', + emptyText: 8007, + deleteEmpty: true, + fieldLabel: gettext('Port'), + }, ], column2: [ -- 2.20.1