From: Fabian Ebner <f.ebner@proxmox.com>
To: pve-devel@lists.proxmox.com
Subject: [pve-devel] [PATCH v2 manager 1/5] ui: avoid errors when 'template' property is not present in guest status
Date: Thu, 11 Mar 2021 11:26:46 +0100 [thread overview]
Message-ID: <20210311102650.6730-2-f.ebner@proxmox.com> (raw)
In-Reply-To: <20210311102650.6730-1-f.ebner@proxmox.com>
The API doesn't advertise the property as non-optional and it's safer and more
in line with the surrounding code.
Signed-off-by: Fabian Ebner <f.ebner@proxmox.com>
---
New in v2.
Needed for the next two patches to work.
www/manager6/lxc/Config.js | 2 +-
www/manager6/qemu/Config.js | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/www/manager6/lxc/Config.js b/www/manager6/lxc/Config.js
index 89747a0a..73e34614 100644
--- a/www/manager6/lxc/Config.js
+++ b/www/manager6/lxc/Config.js
@@ -347,7 +347,7 @@ Ext.define('PVE.lxc.Config', {
var rec = s.data.get('status');
status = rec ? rec.data.value : 'unknown';
rec = s.data.get('template');
- template = rec.data.value || false;
+ template = rec ? rec.data.value : false;
rec = s.data.get('lock');
lock = rec ? rec.data.value : undefined;
}
diff --git a/www/manager6/qemu/Config.js b/www/manager6/qemu/Config.js
index c0c6552c..10bf10a4 100644
--- a/www/manager6/qemu/Config.js
+++ b/www/manager6/qemu/Config.js
@@ -385,7 +385,7 @@ Ext.define('PVE.qemu.Config', {
rec = s.data.get('qmpstatus');
qmpstatus = rec ? rec.data.value : 'unknown';
rec = s.data.get('template');
- template = rec.data.value || false;
+ template = rec ? rec.data.value : false;
rec = s.data.get('lock');
lock = rec ? rec.data.value : undefined;
--
2.20.1
next prev parent reply other threads:[~2021-03-11 10:26 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-03-11 10:26 [pve-devel] [PATCH-SERIES v2] small improvements for parsing and printing Fabian Ebner
2021-03-11 10:26 ` Fabian Ebner [this message]
2021-03-15 13:00 ` [pve-devel] applied: [PATCH v2 manager 1/5] ui: avoid errors when 'template' property is not present in guest status Thomas Lamprecht
2021-03-11 10:26 ` [pve-devel] [PATCH v2 qemu-server 2/5] vmstatus: make template property optional Fabian Ebner
2021-03-15 13:00 ` Thomas Lamprecht
2021-05-26 8:57 ` Fabian Ebner
2021-05-26 15:41 ` [pve-devel] applied: " Thomas Lamprecht
2021-03-11 10:26 ` [pve-devel] [PATCH v2 container 3/5] " Fabian Ebner
2021-03-15 13:01 ` Thomas Lamprecht
2021-03-16 8:04 ` Fabian Ebner
2021-05-26 15:41 ` [pve-devel] applied: " Thomas Lamprecht
2021-03-11 10:26 ` [pve-devel] [PATCH v2 container 4/5] config: parse: also allow empty values Fabian Ebner
2021-03-15 13:24 ` [pve-devel] applied: " Thomas Lamprecht
2021-03-11 10:26 ` [pve-devel] [RFC/PATCH v2 container 5/5] vmstatus: make lock property optional again Fabian Ebner
2021-03-15 13:42 ` [pve-devel] applied: " Thomas Lamprecht
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210311102650.6730-2-f.ebner@proxmox.com \
--to=f.ebner@proxmox.com \
--cc=pve-devel@lists.proxmox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox