all lists on lists.proxmox.com
 help / color / mirror / Atom feed
From: Fabian Ebner <f.ebner@proxmox.com>
To: pve-devel@lists.proxmox.com, pbs-devel@lists.proxmox.com
Subject: [pve-devel] [PATCH proxmox-backup 2/6] ui: tasks: use warningsText
Date: Fri, 12 Mar 2021 13:53:25 +0100	[thread overview]
Message-ID: <20210312125329.20918-3-f.ebner@proxmox.com> (raw)
In-Reply-To: <20210312125329.20918-1-f.ebner@proxmox.com>

to avoid having capitalized 'WARNINGS' (especially since 'Error' is not) and
support different languages.

Signed-off-by: Fabian Ebner <f.ebner@proxmox.com>
---

Dependency bump for widget-toolkit is needed.

 www/panel/Tasks.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/www/panel/Tasks.js b/www/panel/Tasks.js
index a194e478..adc82d05 100644
--- a/www/panel/Tasks.js
+++ b/www/panel/Tasks.js
@@ -376,8 +376,9 @@ Ext.define('PBS.node.Tasks', {
 		switch (parsed) {
 		    case 'unknown': return Proxmox.Utils.unknownText;
 		    case 'error': return Proxmox.Utils.errorText + ': ' + value;
+		    case 'warning': return Proxmox.Utils.warningsText +
+			value.replace('WARNINGS', '');
 		    case 'ok': // fall-through
-		    case 'warning': // fall-through
 		    default: return value;
 		}
 	    },
-- 
2.20.1





WARNING: multiple messages have this Message-ID
From: Fabian Ebner <f.ebner@proxmox.com>
To: pve-devel@lists.proxmox.com, pbs-devel@lists.proxmox.com
Subject: [pbs-devel] [PATCH proxmox-backup 2/6] ui: tasks: use warningsText
Date: Fri, 12 Mar 2021 13:53:25 +0100	[thread overview]
Message-ID: <20210312125329.20918-3-f.ebner@proxmox.com> (raw)
In-Reply-To: <20210312125329.20918-1-f.ebner@proxmox.com>

to avoid having capitalized 'WARNINGS' (especially since 'Error' is not) and
support different languages.

Signed-off-by: Fabian Ebner <f.ebner@proxmox.com>
---

Dependency bump for widget-toolkit is needed.

 www/panel/Tasks.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/www/panel/Tasks.js b/www/panel/Tasks.js
index a194e478..adc82d05 100644
--- a/www/panel/Tasks.js
+++ b/www/panel/Tasks.js
@@ -376,8 +376,9 @@ Ext.define('PBS.node.Tasks', {
 		switch (parsed) {
 		    case 'unknown': return Proxmox.Utils.unknownText;
 		    case 'error': return Proxmox.Utils.errorText + ': ' + value;
+		    case 'warning': return Proxmox.Utils.warningsText +
+			value.replace('WARNINGS', '');
 		    case 'ok': // fall-through
-		    case 'warning': // fall-through
 		    default: return value;
 		}
 	    },
-- 
2.20.1





  parent reply	other threads:[~2021-03-12 12:54 UTC|newest]

Thread overview: 20+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-03-12 12:53 [pve-devel] [PATCH-SERIES] improve warnings handling in UI and add to PVE Fabian Ebner
2021-03-12 12:53 ` [pbs-devel] " Fabian Ebner
2021-03-12 12:53 ` [pve-devel] [PATCH widget-toolkit 1/6] tasks: add warningsText Fabian Ebner
2021-03-12 12:53   ` [pbs-devel] " Fabian Ebner
2021-03-12 12:53 ` Fabian Ebner [this message]
2021-03-12 12:53   ` [pbs-devel] [PATCH proxmox-backup 2/6] ui: tasks: use warningsText Fabian Ebner
2021-03-12 12:53 ` [pve-devel] [PATCH manager 3/6] ui: cluster task log: eslint fixes Fabian Ebner
2021-03-12 12:53   ` [pbs-devel] " Fabian Ebner
2021-03-16 13:53   ` [pve-devel] applied: " Dominik Csapak
2021-03-16 13:53     ` [pbs-devel] " Dominik Csapak
2021-03-12 12:53 ` [pve-devel] [PATCH manager 4/6] ui: cluster task log: handle warnings like the node task log does Fabian Ebner
2021-03-12 12:53   ` [pbs-devel] " Fabian Ebner
2021-03-12 12:53 ` [pve-devel] [PATCH/RFC common 5/6] allow workers to count warnings and finish tasks in a WARNINGS state Fabian Ebner
2021-03-12 12:53   ` [pbs-devel] " Fabian Ebner
2021-03-12 12:53 ` [pve-devel] [PATCH/RFC container 6/6] restore: sanitize config: use new warn() function Fabian Ebner
2021-03-12 12:53   ` [pbs-devel] " Fabian Ebner
2021-03-16 14:02 ` [pve-devel] [pbs-devel] [PATCH-SERIES] improve warnings handling in UI and add to PVE Dominik Csapak
2021-03-16 14:02   ` Dominik Csapak
2021-03-17  8:33   ` [pve-devel] " Fabian Ebner
2021-03-17  8:33     ` 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=20210312125329.20918-3-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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.
Service provided by Proxmox Server Solutions GmbH | Privacy | Legal