From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id AE4A8BF35 for ; Mon, 2 May 2022 15:15:51 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 9A8E9278E3 for ; Mon, 2 May 2022 15:15:21 +0200 (CEST) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [94.136.29.106]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS id 18549278DA for ; Mon, 2 May 2022 15:15:21 +0200 (CEST) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id DBCEA42934 for ; Mon, 2 May 2022 15:15:20 +0200 (CEST) From: Dominik Csapak To: pve-devel@lists.proxmox.com Date: Mon, 2 May 2022 15:15:20 +0200 Message-Id: <20220502131520.3182327-1-d.csapak@proxmox.com> X-Mailer: git-send-email 2.30.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.122 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record T_SCC_BODY_TEXT_LINE -0.01 - Subject: [pve-devel] [PATCH manager] ui: realm sync: let users set 'remove vanished options' independently X-BeenThere: pve-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox VE development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 02 May 2022 13:15:51 -0000 and label it correctly. The 'Properties' option was mislabeled, it means 'remove vanished fields from synced users', not 'remove fields from vanished users'. So don't couple that with the 'Entries' option, and update the label to convey the right meaning. Signed-off-by: Dominik Csapak --- www/manager6/dc/AuthEditLDAP.js | 18 +----------------- www/manager6/dc/SyncWindow.js | 2 +- 2 files changed, 2 insertions(+), 18 deletions(-) diff --git a/www/manager6/dc/AuthEditLDAP.js b/www/manager6/dc/AuthEditLDAP.js index 4a0823af..96ef77b9 100644 --- a/www/manager6/dc/AuthEditLDAP.js +++ b/www/manager6/dc/AuthEditLDAP.js @@ -99,22 +99,6 @@ Ext.define('PVE.panel.LDAPSyncInputPanel', { extend: 'Proxmox.panel.InputPanel', xtype: 'pveAuthLDAPSyncPanel', - controller: { - xclass: 'Ext.app.ViewController', - control: { - 'proxmoxcheckbox[name=remove-vanished-entry]': { - change: function(_f, removeEntries) { - let propertyField = this.getView() - .down('proxmoxcheckbox[name=remove-vanished-properties]'); - propertyField.setDisabled(removeEntries); - if (removeEntries) { - propertyField.setValue(true); - } - }, - }, - }, - }, - editableAttributes: ['email'], editableDefaults: ['scope', 'enable-new'], default_opts: {}, @@ -312,7 +296,7 @@ Ext.define('PVE.panel.LDAPSyncInputPanel', { xtype: 'proxmoxcheckbox', fieldLabel: gettext('Properties'), name: 'remove-vanished-properties', - boxLabel: gettext('Remove properties from vanished users.'), + boxLabel: gettext('Remove vanished properties from synced users.'), }, ], }, diff --git a/www/manager6/dc/SyncWindow.js b/www/manager6/dc/SyncWindow.js index 1d8bef8f..c46dd701 100644 --- a/www/manager6/dc/SyncWindow.js +++ b/www/manager6/dc/SyncWindow.js @@ -138,7 +138,7 @@ Ext.define('PVE.dc.SyncWindow', { xtype: 'proxmoxcheckbox', fieldLabel: gettext('Properties'), name: 'remove-vanished-properties', - boxLabel: gettext('Remove properties from vanished users.'), + boxLabel: gettext('Remove vanished properties from synced users.'), }, ], }, -- 2.30.2