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 65FF271CE7 for ; Wed, 30 Jun 2021 12:20:25 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 6436F18622 for ; Wed, 30 Jun 2021 12:20:25 +0200 (CEST) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [94.136.29.106]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS id 9B0F8185FA for ; Wed, 30 Jun 2021 12:20:23 +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 6EAF846815 for ; Wed, 30 Jun 2021 12:20:23 +0200 (CEST) From: Fabian Ebner To: pve-devel@lists.proxmox.com Date: Wed, 30 Jun 2021 12:20:19 +0200 Message-Id: <20210630102019.39057-5-f.ebner@proxmox.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210630102019.39057-1-f.ebner@proxmox.com> References: <20210630102019.39057-1-f.ebner@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.580 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment PROLO_LEO1 0.1 Meta Catches all Leo drug variations so far SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record Subject: [pve-devel] [PATCH proxmox-widget-toolkit 1/1] apt repositories: replace OfficialHost with Origin X-BeenThere: pve-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox VE development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 30 Jun 2021 10:20:25 -0000 to adapt to the new backend behavior. Signed-off-by: Fabian Ebner --- src/node/APTRepositories.js | 28 ++++++++-------------------- 1 file changed, 8 insertions(+), 20 deletions(-) diff --git a/src/node/APTRepositories.js b/src/node/APTRepositories.js index fb6edaf..6812d46 100644 --- a/src/node/APTRepositories.js +++ b/src/node/APTRepositories.js @@ -3,7 +3,7 @@ Ext.define('apt-repolist', { fields: [ 'Path', 'Index', - 'OfficialHost', + 'Origin', 'FileType', 'Enabled', 'Comment', @@ -191,21 +191,9 @@ Ext.define('Proxmox.node.APTRepositoriesGrid', { flex: 1, }, { - header: gettext('Official'), - dataIndex: 'OfficialHost', - renderer: function(value, cell, record) { - let icon = (cls) => ``; - - if (value === undefined || value === null) { - return icon('fa-question-circle-o'); - } - const enabled = record.data.Enabled; - if (!value) { - return icon('fa-question ' + (enabled ? 'warning' : 'faded')); - } - return icon('fa-check ' + (enabled ? 'good' : 'faded')); - }, - width: 70, + header: gettext('Origin'), + dataIndex: 'Origin', + width: 100, }, { header: gettext('Comment'), @@ -218,7 +206,7 @@ Ext.define('Proxmox.node.APTRepositoriesGrid', { let me = this; let warnings = {}; - let officialHosts = {}; + let origins = {}; let addLine = function(obj, key, line) { if (obj[key]) { @@ -235,14 +223,14 @@ Ext.define('Proxmox.node.APTRepositoriesGrid', { (info.kind === 'ignore-pre-upgrade-warning' && !me.majorUpgradeAllowed) ) { addLine(warnings, key, gettext('Warning') + ": " + info.message); - } else if (info.kind === 'badge' && info.message === 'official host name') { - officialHosts[key] = true; + } else if (info.kind === 'origin') { + origins[key] = info.message; } } gridData.forEach(function(record) { const key = `${record.Path}:${record.Index}`; - record.OfficialHost = !!officialHosts[key]; + record.Origin = origins[key]; }); me.rowBodyFeature.getAdditionalData = function(innerData, rowIndex, record, orig) { -- 2.30.2