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}', + }, }, ], },