From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <d.jaeger@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 5D24074383
for <pve-devel@lists.proxmox.com>; Thu, 8 Jul 2021 13:41:47 +0200 (CEST)
Received: from firstgate.proxmox.com (localhost [127.0.0.1])
by firstgate.proxmox.com (Proxmox) with ESMTP id 5937B17A31
for <pve-devel@lists.proxmox.com>; Thu, 8 Jul 2021 13:41:47 +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))
(No client certificate requested)
by firstgate.proxmox.com (Proxmox) with ESMTPS id C81D817A26
for <pve-devel@lists.proxmox.com>; Thu, 8 Jul 2021 13:41:46 +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 9DBAB40EF9
for <pve-devel@lists.proxmox.com>; Thu, 8 Jul 2021 13:41:46 +0200 (CEST)
From: =?UTF-8?q?Dominic=20J=C3=A4ger?= <d.jaeger@proxmox.com>
To: pve-devel@lists.proxmox.com
Date: Thu, 8 Jul 2021 13:41:24 +0200
Message-Id: <20210708114124.161545-2-d.jaeger@proxmox.com>
X-Mailer: git-send-email 2.30.2
In-Reply-To: <20210708114124.161545-1-d.jaeger@proxmox.com>
References: <20210708114124.161545-1-d.jaeger@proxmox.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-SPAM-LEVEL: Spam detection results: 0
AWL 1.255 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
SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record
SPF_PASS -0.001 SPF: sender matches 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.id]
Subject: [pve-devel] [PATCH manager] dc menu: close 3504: Add datacenter
notes
X-BeenThere: pve-devel@lists.proxmox.com
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: Proxmox VE development discussion <pve-devel.lists.proxmox.com>
List-Unsubscribe: <https://lists.proxmox.com/cgi-bin/mailman/options/pve-devel>,
<mailto:pve-devel-request@lists.proxmox.com?subject=unsubscribe>
List-Archive: <http://lists.proxmox.com/pipermail/pve-devel/>
List-Post: <mailto:pve-devel@lists.proxmox.com>
List-Help: <mailto:pve-devel-request@lists.proxmox.com?subject=help>
List-Subscribe: <https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel>,
<mailto:pve-devel-request@lists.proxmox.com?subject=subscribe>
X-List-Received-Date: Thu, 08 Jul 2021 11:41:47 -0000
Like notes for nodes.
Signed-off-by: Dominic Jäger <d.jaeger@proxmox.com>
---
Depends on the pve-cluster patch.
www/manager6/dc/Config.js | 6 ++++
www/manager6/panel/NotesView.js | 49 +++++++++++++++++----------------
2 files changed, 32 insertions(+), 23 deletions(-)
diff --git a/www/manager6/dc/Config.js b/www/manager6/dc/Config.js
index a8dcb74e..9fb47afa 100644
--- a/www/manager6/dc/Config.js
+++ b/www/manager6/dc/Config.js
@@ -27,6 +27,12 @@ Ext.define('PVE.dc.Config', {
iconCls: 'fa fa-book',
itemId: 'summary',
},
+ {
+ xtype: 'pveNotesView',
+ title: gettext('Notes'),
+ iconCls: 'fa fa-sticky-note-o',
+ itemId: 'notes',
+ },
{
title: gettext('Cluster'),
xtype: 'pveClusterAdministration',
diff --git a/www/manager6/panel/NotesView.js b/www/manager6/panel/NotesView.js
index b281f892..6e7b55f6 100644
--- a/www/manager6/panel/NotesView.js
+++ b/www/manager6/panel/NotesView.js
@@ -79,37 +79,40 @@ Ext.define('PVE.panel.NotesView', {
}],
initComponent: function() {
- var me = this;
+ const me = this;
+ const type = me.pveSelNode.data.type;
- var nodename = me.pveSelNode.data.node;
- if (!nodename) {
- throw "no node name specified";
- }
+ if (me.pveSelNode.data.id === 'root') {
+ me.url = '/api2/extjs/cluster/options';
+ } else {
+ const nodename = me.pveSelNode.data.node;
+ if (!nodename) {
+ throw "no node name specified";
+ }
- let type = me.pveSelNode.data.type;
- if (!Ext.Array.contains(['node', 'qemu', 'lxc'], type)) {
- throw 'invalid type specified';
- }
+ if (!Ext.Array.contains(['node', 'qemu', 'lxc'], type)) {
+ throw 'invalid type specified';
+ }
- var vmid = me.pveSelNode.data.vmid;
- if (!vmid && type !== 'node') {
- throw "no VM ID specified";
- }
+ const vmid = me.pveSelNode.data.vmid;
+ if (!vmid && type !== 'node') {
+ throw "no VM ID specified";
+ }
- me.url = `/api2/extjs/nodes/${nodename}/`;
+ me.url = `/api2/extjs/nodes/${nodename}/`;
- // add the type specific path if qemu/lxc and set the backend's maxLen
- if (type === 'qemu' || type === 'lxc') {
- me.url += `${type}/${vmid}/`;
- me.maxLength = 8 * 1024;
- } else {
- me.maxLength = 64 * 1024;
+ // add the type specific path if qemu/lxc and set the backend's maxLen
+ if (type === 'qemu' || type === 'lxc') {
+ me.url += `${type}/${vmid}/`;
+ me.maxLength = 8 * 1024;
+ } else {
+ me.maxLength = 64 * 1024;
+ }
+ me.url += 'config';
}
- me.url += 'config';
-
me.callParent();
- if (type === 'node') {
+ if (type === 'node' || type === '') { // is '' for datacenter
me.down('#tbar').setVisible(true);
} else if (me.pveSelNode.data.template !== 1) {
me.setCollapsible(true);
--
2.30.2