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) server-digest SHA256) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id 8F14868CE0 for ; Wed, 11 Nov 2020 13:34:16 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 7F0552BED8 for ; Wed, 11 Nov 2020 13:34:16 +0100 (CET) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [212.186.127.180]) (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 D81002BECE for ; Wed, 11 Nov 2020 13:34:15 +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 9E1C445D57 for ; Wed, 11 Nov 2020 13:34:15 +0100 (CET) From: Dominik Csapak To: pbs-devel@lists.proxmox.com Date: Wed, 11 Nov 2020 13:34:13 +0100 Message-Id: <20201111123414.19657-1-d.csapak@proxmox.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.373 Adjusted score from AWL reputation of From: address KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment RCVD_IN_DNSWL_MED -2.3 Sender listed at https://www.dnswl.org/, medium trust SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [user.rs, data.email] Subject: [pbs-devel] [PATCH proxmox-backup 1/2] make user properties deletable X-BeenThere: pbs-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox Backup Server development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 11 Nov 2020 12:34:16 -0000 by using our usual pattern for the update call Signed-off-by: Dominik Csapak --- src/api2/access/user.rs | 35 +++++++++++++++++++++++++++++++++++ www/window/UserEdit.js | 12 ++++++++++++ 2 files changed, 47 insertions(+) diff --git a/src/api2/access/user.rs b/src/api2/access/user.rs index b4cb1942..49ddff65 100644 --- a/src/api2/access/user.rs +++ b/src/api2/access/user.rs @@ -268,6 +268,21 @@ pub fn read_user(userid: Userid, mut rpcenv: &mut dyn RpcEnvironment) -> Result< Ok(user) } +#[api()] +#[derive(Serialize, Deserialize)] +#[serde(rename_all="kebab-case")] +#[allow(non_camel_case_types)] +pub enum DeletableProperty { + /// Delete the comment property. + comment, + /// Delete the firstname property. + firstname, + /// Delete the lastname property. + lastname, + /// Delete the email property. + email, +} + #[api( protected: true, input: { @@ -303,6 +318,14 @@ pub fn read_user(userid: Userid, mut rpcenv: &mut dyn RpcEnvironment) -> Result< schema: user::EMAIL_SCHEMA, optional: true, }, + delete: { + description: "List of properties to delete.", + type: Array, + optional: true, + items: { + type: DeletableProperty, + } + }, digest: { optional: true, schema: PROXMOX_CONFIG_DIGEST_SCHEMA, @@ -326,6 +349,7 @@ pub fn update_user( firstname: Option, lastname: Option, email: Option, + delete: Option>, digest: Option, ) -> Result<(), Error> { @@ -340,6 +364,17 @@ pub fn update_user( let mut data: user::User = config.lookup("user", userid.as_str())?; + if let Some(delete) = delete { + for delete_prop in delete { + match delete_prop { + DeletableProperty::comment => data.comment = None, + DeletableProperty::firstname => data.firstname = None, + DeletableProperty::lastname => data.lastname = None, + DeletableProperty::email => data.email = None, + } + } + } + if let Some(comment) = comment { let comment = comment.trim().to_string(); if comment.is_empty() { diff --git a/www/window/UserEdit.js b/www/window/UserEdit.js index d39a85d2..aaae835f 100644 --- a/www/window/UserEdit.js +++ b/www/window/UserEdit.js @@ -100,17 +100,26 @@ Ext.define('PBS.window.UserEdit', { xtype: 'proxmoxtextfield', name: 'firstname', fieldLabel: gettext('First Name'), + cbind: { + deleteEmpty: '{!isCreate}', + }, }, { xtype: 'proxmoxtextfield', name: 'lastname', fieldLabel: gettext('Last Name'), + cbind: { + deleteEmpty: '{!isCreate}', + }, }, { xtype: 'proxmoxtextfield', name: 'email', fieldLabel: gettext('E-Mail'), vtype: 'proxmoxMail', + cbind: { + deleteEmpty: '{!isCreate}', + }, }, ], @@ -119,6 +128,9 @@ Ext.define('PBS.window.UserEdit', { xtype: 'proxmoxtextfield', name: 'comment', fieldLabel: gettext('Comment'), + cbind: { + deleteEmpty: '{!isCreate}', + }, }, ], }, -- 2.20.1