* [pve-devel] [PATCH-SERIES v2 manager/docs] add warning for disabling users @ 2021-06-23 7:37 Lorenz Stechauner 2021-06-23 7:37 ` [pve-devel] [PATCH v2 manager 1/1] ui: dc/UserEdit: " Lorenz Stechauner 2021-06-23 7:37 ` [pve-devel] [PATCH v2 docs 1/1] pveum: add warning for disabling or deleting users Lorenz Stechauner 0 siblings, 2 replies; 5+ messages in thread From: Lorenz Stechauner @ 2021-06-23 7:37 UTC (permalink / raw) To: pve-devel changes to v1: * e.g. -> for example * small sentence structure changes pve-manager: Lorenz Stechauner (1): ui: dc/UserEdit: add warning for disabling users www/manager6/dc/UserEdit.js | 14 ++++++++++++++ 1 file changed, 14 insertions(+) pve-doc: Lorenz Stechauner (1): pveum: add warning for disabling or deleting users pveum.adoc | 5 +++++ 1 file changed, 5 insertions(+) -- 2.30.2 ^ permalink raw reply [flat|nested] 5+ messages in thread
* [pve-devel] [PATCH v2 manager 1/1] ui: dc/UserEdit: add warning for disabling users 2021-06-23 7:37 [pve-devel] [PATCH-SERIES v2 manager/docs] add warning for disabling users Lorenz Stechauner @ 2021-06-23 7:37 ` Lorenz Stechauner 2021-06-23 9:32 ` Thomas Lamprecht 2021-06-23 7:37 ` [pve-devel] [PATCH v2 docs 1/1] pveum: add warning for disabling or deleting users Lorenz Stechauner 1 sibling, 1 reply; 5+ messages in thread From: Lorenz Stechauner @ 2021-06-23 7:37 UTC (permalink / raw) To: pve-devel see #3101 Signed-off-by: Lorenz Stechauner <l.stechauner@proxmox.com> --- www/manager6/dc/UserEdit.js | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/www/manager6/dc/UserEdit.js b/www/manager6/dc/UserEdit.js index b637cd53..65a612fd 100644 --- a/www/manager6/dc/UserEdit.js +++ b/www/manager6/dc/UserEdit.js @@ -73,6 +73,12 @@ Ext.define('PVE.dc.UserEdit', { uncheckedValue: 0, defaultValue: 1, checked: true, + listeners: { + change: function(checkbox) { + let taskWarning = me.lookup('taskWarning'); + taskWarning.setHidden(!(me.wasEnabled && !checkbox.value)); + }, + }, }, ]; @@ -93,6 +99,13 @@ Ext.define('PVE.dc.UserEdit', { fieldLabel: gettext('E-Mail'), vtype: 'proxmoxMail', }, + { + xtype: 'displayfield', + reference: 'taskWarning', + userCls: 'pmx-hint', + value: gettext('Note: Already running tasks of user will not be terminated automatically!'), + hidden: true, + }, ]; if (me.isCreate) { @@ -161,6 +174,7 @@ Ext.define('PVE.dc.UserEdit', { success: function(response, options) { var data = response.result.data; me.setValues(data); + me.wasEnabled = data.enable; if (data.keys) { if (data.keys === 'x!oath' || data.keys === 'x!u2f') { me.down('[name="keys"]').setDisabled(1); -- 2.30.2 ^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [pve-devel] [PATCH v2 manager 1/1] ui: dc/UserEdit: add warning for disabling users 2021-06-23 7:37 ` [pve-devel] [PATCH v2 manager 1/1] ui: dc/UserEdit: " Lorenz Stechauner @ 2021-06-23 9:32 ` Thomas Lamprecht 0 siblings, 0 replies; 5+ messages in thread From: Thomas Lamprecht @ 2021-06-23 9:32 UTC (permalink / raw) To: Proxmox VE development discussion, Lorenz Stechauner On 23.06.21 09:37, Lorenz Stechauner wrote: > see #3101 > > Signed-off-by: Lorenz Stechauner <l.stechauner@proxmox.com> > --- I should have given this a closer look when commenting on the docs v1 patch, sorry. In general this would miss for removal and when the expiry date would be set to the past, but it may make sense to place a API call for running tasks from the user and only show the warning if there are any. But, with the docs change applied it's at least clearly documented, so IMO not a very pressing matter. > www/manager6/dc/UserEdit.js | 14 ++++++++++++++ > 1 file changed, 14 insertions(+) > > diff --git a/www/manager6/dc/UserEdit.js b/www/manager6/dc/UserEdit.js > index b637cd53..65a612fd 100644 > --- a/www/manager6/dc/UserEdit.js > +++ b/www/manager6/dc/UserEdit.js > @@ -73,6 +73,12 @@ Ext.define('PVE.dc.UserEdit', { > uncheckedValue: 0, > defaultValue: 1, > checked: true, > + listeners: { > + change: function(checkbox) { the change listener gives you the new value as second parameter, please us that one. https://docs.sencha.com/extjs/6.0.1/classic/Ext.form.field.Checkbox.html#event-change > + let taskWarning = me.lookup('taskWarning'); > + taskWarning.setHidden(!(me.wasEnabled && !checkbox.value)); for single use, where we are sure that the variable isn't undefined/null, it's often nicer to just use chaining, e.g., here: me.lookup('taskWarning').setHidden(!(me.wasEnabled && !value)); also > + }, > + }, > }, > ]; > > @@ -93,6 +99,13 @@ Ext.define('PVE.dc.UserEdit', { > fieldLabel: gettext('E-Mail'), > vtype: 'proxmoxMail', > }, > + { > + xtype: 'displayfield', > + reference: 'taskWarning', > + userCls: 'pmx-hint', > + value: gettext('Note: Already running tasks of user will not be terminated automatically!'), > + hidden: true, > + }, I'd move that to the end of (non-advanced) columnB, looks better there IMO. > ]; > > if (me.isCreate) { > @@ -161,6 +174,7 @@ Ext.define('PVE.dc.UserEdit', { > success: function(response, options) { > var data = response.result.data; > me.setValues(data); > + me.wasEnabled = data.enable; > if (data.keys) { > if (data.keys === 'x!oath' || data.keys === 'x!u2f') { > me.down('[name="keys"]').setDisabled(1); > ^ permalink raw reply [flat|nested] 5+ messages in thread
* [pve-devel] [PATCH v2 docs 1/1] pveum: add warning for disabling or deleting users 2021-06-23 7:37 [pve-devel] [PATCH-SERIES v2 manager/docs] add warning for disabling users Lorenz Stechauner 2021-06-23 7:37 ` [pve-devel] [PATCH v2 manager 1/1] ui: dc/UserEdit: " Lorenz Stechauner @ 2021-06-23 7:37 ` Lorenz Stechauner 2021-06-23 9:21 ` [pve-devel] applied: " Thomas Lamprecht 1 sibling, 1 reply; 5+ messages in thread From: Lorenz Stechauner @ 2021-06-23 7:37 UTC (permalink / raw) To: pve-devel see #3101 Signed-off-by: Lorenz Stechauner <l.stechauner@proxmox.com> --- pveum.adoc | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pveum.adoc b/pveum.adoc index 71ea7ef..5feb2c2 100644 --- a/pveum.adoc +++ b/pveum.adoc @@ -56,6 +56,11 @@ Each user entry in this file contains the following information: * Whether this user is enabled or disabled * Optional two-factor authentication keys +CAUTION: After disabling or deleting a user, this user will not be able to +log in to new sessions or start new tasks. All tasks which already have +been started by this user (for example terminal sessions) will **not** be +terminated automatically. + System administrator ~~~~~~~~~~~~~~~~~~~~ -- 2.30.2 ^ permalink raw reply [flat|nested] 5+ messages in thread
* [pve-devel] applied: [PATCH v2 docs 1/1] pveum: add warning for disabling or deleting users 2021-06-23 7:37 ` [pve-devel] [PATCH v2 docs 1/1] pveum: add warning for disabling or deleting users Lorenz Stechauner @ 2021-06-23 9:21 ` Thomas Lamprecht 0 siblings, 0 replies; 5+ messages in thread From: Thomas Lamprecht @ 2021-06-23 9:21 UTC (permalink / raw) To: Proxmox VE development discussion, Lorenz Stechauner On 23.06.21 09:37, Lorenz Stechauner wrote: > see #3101 > > Signed-off-by: Lorenz Stechauner <l.stechauner@proxmox.com> > --- > pveum.adoc | 5 +++++ > 1 file changed, 5 insertions(+) > > applied, added also that this is true for hitting the expiry date too, thanks! ^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2021-06-23 9:32 UTC | newest] Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2021-06-23 7:37 [pve-devel] [PATCH-SERIES v2 manager/docs] add warning for disabling users Lorenz Stechauner 2021-06-23 7:37 ` [pve-devel] [PATCH v2 manager 1/1] ui: dc/UserEdit: " Lorenz Stechauner 2021-06-23 9:32 ` Thomas Lamprecht 2021-06-23 7:37 ` [pve-devel] [PATCH v2 docs 1/1] pveum: add warning for disabling or deleting users Lorenz Stechauner 2021-06-23 9:21 ` [pve-devel] applied: " Thomas Lamprecht
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox