From: Fabian Ebner <f.ebner@proxmox.com>
To: pve-devel@lists.proxmox.com, pbs-devel@lists.proxmox.com
Subject: [pve-devel] [PATCH v2 manager 5/7] ui: cluster task log: handle warnings like the node task log does
Date: Fri, 9 Apr 2021 10:44:34 +0200 [thread overview]
Message-ID: <20210409084436.2454-6-f.ebner@proxmox.com> (raw)
In-Reply-To: <20210409084436.2454-1-f.ebner@proxmox.com>
Copied the relevant code from widget-toolkit.
Signed-off-by: Fabian Ebner <f.ebner@proxmox.com>
---
Dependency bump for widget-toolkit is needed.
Changes from v1:
* use new helper
www/manager6/dc/Tasks.js | 17 ++++++++++-------
1 file changed, 10 insertions(+), 7 deletions(-)
diff --git a/www/manager6/dc/Tasks.js b/www/manager6/dc/Tasks.js
index c5075dc3..2ecd61ee 100644
--- a/www/manager6/dc/Tasks.js
+++ b/www/manager6/dc/Tasks.js
@@ -61,9 +61,15 @@ Ext.define('PVE.dc.Tasks', {
getRowClass: function(record, index) {
var status = record.get('status');
- if (status && status != 'OK') {
- return "proxmox-invalid-row";
+ if (status) {
+ let parsed = Proxmox.Utils.parse_task_status(status);
+ if (parsed === 'error') {
+ return "proxmox-invalid-row";
+ } else if (parsed === 'warning') {
+ return "proxmox-warning-row";
+ }
}
+ return '';
},
},
sortableColumns: false,
@@ -122,11 +128,8 @@ Ext.define('PVE.dc.Tasks', {
}
return "";
}
- if (value == 'OK') {
- return 'OK';
- }
- // metaData.attr = 'style="color:red;"';
- return Proxmox.Utils.errorText + ': ' + value;
+
+ return Proxmox.Utils.format_task_status(value);
},
},
],
--
2.20.1
next prev parent reply other threads:[~2021-04-09 8:45 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-04-09 8:44 [pve-devel] [PATCH-SERIES v2] improve warnings handling in UI and add to PVE Fabian Ebner
2021-04-09 8:44 ` [pve-devel] [PATCH v2 widget-toolkit 1/7] task status: create helper for formatting Fabian Ebner
2021-04-23 12:54 ` [pve-devel] applied: " Thomas Lamprecht
2021-04-09 8:44 ` [pve-devel] [PATCH v2 widget-toolkit 2/7] format task status: rename variable Fabian Ebner
2021-04-23 12:54 ` [pve-devel] applied: " Thomas Lamprecht
2021-04-09 8:44 ` [pve-devel] [PATCH v2 widget-toolkit 3/7] format task status: improve replace() usage Fabian Ebner
2021-04-23 12:54 ` [pve-devel] applied: " Thomas Lamprecht
2021-04-09 8:44 ` [pve-devel] [PATCH v2 proxmox-backup 4/7] ui: tasks: use format_task_status Fabian Ebner
2021-04-09 8:44 ` Fabian Ebner [this message]
2021-04-09 8:44 ` [pve-devel] [PATCH/RFC v2 common 6/7] allow workers to count warnings and finish tasks in a WARNINGS state Fabian Ebner
2021-04-23 12:36 ` [pve-devel] applied: " Thomas Lamprecht
2021-04-09 8:44 ` [pve-devel] [PATCH/RFC v2 container 7/7] restore: sanitize config: use new warn() function Fabian Ebner
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=20210409084436.2454-6-f.ebner@proxmox.com \
--to=f.ebner@proxmox.com \
--cc=pbs-devel@lists.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