Undelete: deleted files, calendar events, contacts and Sieve scripts are kept and restored where they were (UD-1, UD-8 to UD-11)
Files, events and contacts are noted when deleted for good and archived by the unindex task when retention is on; Sieve scripts are archived at deletion. A restore goes back to its folder, calendar or address book if it still exists, takes a free " (restored)" name, comes back inactive for scripts, and is refused over quota with the item left archived. Acceptance tests 6, 8 and 12.
This commit is contained in:
@@ -82,6 +82,14 @@ impl DestroyArchive<Archive<&ArchivedFileNode>> {
|
||||
batch: &mut BatchBuilder,
|
||||
path: String,
|
||||
) -> trc::Result<()> {
|
||||
// inbuxa: UD-1: noted for undelete
|
||||
crate::inbuxa::note_file(
|
||||
batch,
|
||||
account_id,
|
||||
document_id,
|
||||
&self.0.deserialize::<FileNode>().caused_by(trc::location!())?,
|
||||
)?;
|
||||
|
||||
// Prepare write batch
|
||||
batch
|
||||
.with_account_id(account_id)
|
||||
@@ -143,6 +151,16 @@ impl DestroyArchive<Vec<u32>> {
|
||||
))
|
||||
.await?
|
||||
{
|
||||
// inbuxa: UD-1: noted for undelete
|
||||
crate::inbuxa::note_file(
|
||||
batch,
|
||||
account_id,
|
||||
document_id,
|
||||
&node
|
||||
.deserialize::<FileNode>()
|
||||
.caused_by(trc::location!())?,
|
||||
)?;
|
||||
|
||||
// Delete record
|
||||
batch
|
||||
.with_document(document_id)
|
||||
|
||||
Reference in New Issue
Block a user