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 7B02D614C2 for ; Fri, 4 Feb 2022 15:25:03 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 637E832F39 for ; Fri, 4 Feb 2022 15:25:03 +0100 (CET) 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 6553F32F26 for ; Fri, 4 Feb 2022 15:25:02 +0100 (CET) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 35DA145635 for ; Fri, 4 Feb 2022 15:25:02 +0100 (CET) From: Dominik Csapak To: pve-devel@lists.proxmox.com Date: Fri, 4 Feb 2022 15:25:01 +0100 Message-Id: <20220204142501.1461441-4-d.csapak@proxmox.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220204142501.1461441-1-d.csapak@proxmox.com> References: <20220204142501.1461441-1-d.csapak@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.160 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 v2 1/1] ui: realm sync: replace 'full' with 'mode' 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: Fri, 04 Feb 2022 14:25:03 -0000 in default sync options and the sync window. since we get the mapped mode from the backend on read, a 'full=1' there will map to 'mode=full' and we can simply use that using this on a node with an old version will not work though Signed-off-by: Dominik Csapak --- www/manager6/dc/AuthEditLDAP.js | 11 ++++++----- www/manager6/dc/SyncWindow.js | 9 +++++---- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/www/manager6/dc/AuthEditLDAP.js b/www/manager6/dc/AuthEditLDAP.js index 015a5a6e..bb50e21b 100644 --- a/www/manager6/dc/AuthEditLDAP.js +++ b/www/manager6/dc/AuthEditLDAP.js @@ -100,7 +100,7 @@ Ext.define('PVE.panel.LDAPSyncInputPanel', { xtype: 'pveAuthLDAPSyncPanel', editableAttributes: ['email'], - editableDefaults: ['scope', 'full', 'enable-new', 'purge'], + editableDefaults: ['scope', 'mode', 'enable-new', 'purge'], default_opts: {}, sync_attributes: {}, @@ -210,11 +210,12 @@ Ext.define('PVE.panel.LDAPSyncInputPanel', { deleteEmpty: false, comboItems: [ ['__default__', Proxmox.Utils.NoneText], - ['1', Proxmox.Utils.yesText], - ['0', Proxmox.Utils.noText], + ['update', gettext('Update')], + ['sync', gettext('Sync')], + ['full', gettext('Full')], ], - name: 'full', - fieldLabel: gettext('Full'), + name: 'mode', + fieldLabel: gettext('Mode'), }, ], diff --git a/www/manager6/dc/SyncWindow.js b/www/manager6/dc/SyncWindow.js index 25a42182..2eeaf572 100644 --- a/www/manager6/dc/SyncWindow.js +++ b/www/manager6/dc/SyncWindow.js @@ -95,11 +95,12 @@ Ext.define('PVE.dc.SyncWindow', { deleteEmpty: false, allowBlank: false, comboItems: [ - ['1', Proxmox.Utils.yesText], - ['0', Proxmox.Utils.noText], + ['update', gettext('Update')], + ['sync', gettext('Sync')], + ['full', gettext('Full')], ], - name: 'full', - fieldLabel: gettext('Full'), + name: 'mode', + fieldLabel: gettext('Mode'), }, ], -- 2.30.2