public inbox for pve-devel@lists.proxmox.com
 help / color / mirror / Atom feed
From: Hannes Laimer <h.laimer@proxmox.com>
To: pve-devel@lists.proxmox.com, pbs-devel@lists.proxmox.com
Subject: [pve-devel] [PATCH v2 proxmox-widget-toolbox 2/6] safe-destroy: add possibility display small note in dialog
Date: Wed, 19 Aug 2020 11:52:43 +0200	[thread overview]
Message-ID: <20200819095247.85518-3-h.laimer@proxmox.com> (raw)
In-Reply-To: <20200819095247.85518-1-h.laimer@proxmox.com>

Signed-off-by: Hannes Laimer <h.laimer@proxmox.com>
---
v1->v2: - split into two patches: [3/5]v1 into [2/6]+[3/6]v2

 src/window/SafeDestroy.js | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/src/window/SafeDestroy.js b/src/window/SafeDestroy.js
index 81c7c27..a456aba 100644
--- a/src/window/SafeDestroy.js
+++ b/src/window/SafeDestroy.js
@@ -21,6 +21,7 @@ Ext.define('Proxmox.window.SafeDestroy', {
 			purgeable: false,
 		},
 	    url: undefined,
+	    note: undefined,
 	    taskName: undefined,
 	    params: {},
     },
@@ -138,6 +139,22 @@ Ext.define('Proxmox.window.SafeDestroy', {
 	                'data-qtip': gettext('Wipe disk after the removal of mountpoint'),
 	            },
 	        },
+	        {
+	            xtype: 'container',
+	            reference: 'noteContainer',
+	            flex: 1,
+	            layout: {
+	            type: 'vbox',
+	            align: 'middle',
+	            },
+	            height: 25,
+	            items: [
+	                {
+	                    xtype: 'component',
+	                    reference: 'noteCmp',
+	                },
+	              ],
+	        },
 	        ],
 	    },
     ],
@@ -160,8 +177,17 @@ Ext.define('Proxmox.window.SafeDestroy', {
 	    }
 
 	    const messageCmp = me.lookupReference('messageCmp');
+	    const noteCmp = me.lookupReference('noteCmp');
 	    let msg;
 
+	    if (Ext.isDefined(me.getNote())) {
+	        noteCmp.setHtml(`<small>${me.getNote()}</small>`);
+	    } else {
+	        const noteContainer = me.lookupReference('noteContainer');
+	        noteContainer.setDisabled(true);
+	        noteContainer.setHidden(true);
+	    }
+
 	    if (Ext.isDefined(me.getTaskName())) {
 	        msg = Proxmox.Utils.format_task_description(me.getTaskName(), item.id);
 			messageCmp.setHtml(msg);
-- 
2.20.1





  parent reply	other threads:[~2020-08-19  9:53 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-08-19  9:52 [pve-devel] [PATCH v2 proxmox-widget-toolbox 0/6] removal of directories in PBS WebUI Hannes Laimer
2020-08-19  9:52 ` [pve-devel] [PATCH v2 proxmox-widget-toolbox 1/6] safe-destroy: moved here from pve-manager and generalized it Hannes Laimer
2020-08-26 18:20   ` [pve-devel] [pbs-devel] " Thomas Lamprecht
2020-08-19  9:52 ` Hannes Laimer [this message]
2020-08-19  9:52 ` [pve-devel] [PATCH v2 proxmox-widget-toolbox 3/6] utils: add task description for directory removal Hannes Laimer
2020-08-19  9:52 ` [pve-devel] [PATCH v2 pve-manager 4/6] ui: move safe-destroy to proxmox-widget-toolkit and adjust usages Hannes Laimer
2020-08-19  9:52 ` [pve-devel] [PATCH v2 proxmox-backup 5/6] api2: add name of mount-point to DatastoreMountInfo Hannes Laimer
2020-08-19  9:52 ` [pve-devel] [PATCH v2 proxmox-backup 6/6] ui: add remove-button for directories/mount-units Hannes Laimer

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=20200819095247.85518-3-h.laimer@proxmox.com \
    --to=h.laimer@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
Service provided by Proxmox Server Solutions GmbH | Privacy | Legal