public inbox for pve-devel@lists.proxmox.com
 help / color / mirror / Atom feed
From: Dominik Csapak <d.csapak@proxmox.com>
To: pve-devel@lists.proxmox.com
Subject: [pve-devel] [PATCH manager v2 1/1] ui: realm sync: replace 'full' with 'mode'
Date: Fri,  4 Feb 2022 15:25:01 +0100	[thread overview]
Message-ID: <20220204142501.1461441-4-d.csapak@proxmox.com> (raw)
In-Reply-To: <20220204142501.1461441-1-d.csapak@proxmox.com>

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 <d.csapak@proxmox.com>
---
 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





  parent reply	other threads:[~2022-02-04 14:25 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-02-04 14:24 [pve-devel] [PATCH access-control/manager v2] fix #3668: improving realm sync Dominik Csapak
2022-02-04 14:24 ` [pve-devel] [PATCH access-control v2 1/2] realm-sync: replace 'full' option with 'mode' Dominik Csapak
2022-02-04 14:25 ` [pve-devel] [PATCH access-control v2 2/2] fix #3668: realm-sync: add mode 'sync' Dominik Csapak
2022-02-04 14:25 ` Dominik Csapak [this message]
2022-03-22  6:11 ` [pve-devel] [PATCH access-control/manager v2] fix #3668: improving realm sync Thomas Lamprecht
2022-03-22 13:44   ` Thomas Lamprecht
2022-03-22 15:23     ` Dominik Csapak
2022-03-23  7:33       ` Thomas Lamprecht
2022-03-23  8:21         ` Thomas Lamprecht

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=20220204142501.1461441-4-d.csapak@proxmox.com \
    --to=d.csapak@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