Merge pull request #711 from ONLYOFFICE/feature/rooms-archive-delete-after
Feature/rooms-archive-delete-after
This commit is contained in:
commit
912bb3ed36
@ -0,0 +1,32 @@
|
||||
// (c) Copyright Ascensio System SIA 2010-2022
|
||||
//
|
||||
// This program is a free software product.
|
||||
// You can redistribute it and/or modify it under the terms
|
||||
// of the GNU Affero General Public License (AGPL) version 3 as published by the Free Software
|
||||
// Foundation. In accordance with Section 7(a) of the GNU AGPL its Section 15 shall be amended
|
||||
// to the effect that Ascensio System SIA expressly excludes the warranty of non-infringement of
|
||||
// any third-party rights.
|
||||
//
|
||||
// This program is distributed WITHOUT ANY WARRANTY, without even the implied warranty
|
||||
// of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. For details, see
|
||||
// the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html
|
||||
//
|
||||
// You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, EU, LV-1021.
|
||||
//
|
||||
// The interactive user interfaces in modified source and object code versions of the Program must
|
||||
// display Appropriate Legal Notices, as required under Section 5 of the GNU AGPL version 3.
|
||||
//
|
||||
// Pursuant to Section 7(b) of the License you must retain the original Product logo when
|
||||
// distributing the program. Pursuant to Section 7(e) we decline to grant you any rights under
|
||||
// trademark law for use of our trademarks.
|
||||
//
|
||||
// All the Product's GUI elements, including illustrations and icon sets, as well as technical writing
|
||||
// content are licensed under the terms of the Creative Commons Attribution-ShareAlike 4.0
|
||||
// International. See the License terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode
|
||||
|
||||
namespace ASC.Files.Core.ApiModels.RequestDto;
|
||||
|
||||
public class ArchiveRoomRequestDto
|
||||
{
|
||||
public bool DeleteAfter { get; set; }
|
||||
}
|
@ -228,18 +228,21 @@ public abstract class VirtualRoomsController<T> : ApiControllerBase
|
||||
/// <param name="id">
|
||||
/// Room ID
|
||||
/// </param>
|
||||
/// <param name="deleteAfter">
|
||||
/// Archive after finished
|
||||
/// </param>
|
||||
/// <returns>
|
||||
/// Result of the operation
|
||||
/// </returns>
|
||||
[HttpPut("rooms/{id}/archive")]
|
||||
public async Task<FileOperationDto> ArchiveRoomAsync(T id)
|
||||
public async Task<FileOperationDto> ArchiveRoomAsync(T id, ArchiveRoomRequestDto inDto)
|
||||
{
|
||||
ErrorIfNotDocSpace();
|
||||
|
||||
var destFolder = JsonSerializer.SerializeToElement(await _globalFolderHelper.FolderArchiveAsync);
|
||||
var movableRoom = JsonSerializer.SerializeToElement(id);
|
||||
|
||||
var operationResult = _fileStorageService.MoveOrCopyItems(new List<JsonElement> { movableRoom }, new List<JsonElement>(), destFolder, FileConflictResolveType.Skip, false, true)
|
||||
var operationResult = _fileStorageService.MoveOrCopyItems(new List<JsonElement> { movableRoom }, new List<JsonElement>(), destFolder, FileConflictResolveType.Skip, false, inDto.DeleteAfter)
|
||||
.FirstOrDefault();
|
||||
|
||||
return await _fileOperationDtoHelper.GetAsync(operationResult);
|
||||
@ -254,18 +257,21 @@ public abstract class VirtualRoomsController<T> : ApiControllerBase
|
||||
/// <param name="id">
|
||||
/// Room ID
|
||||
/// </param>
|
||||
/// <param name="deleteAfter">
|
||||
/// Unarchive after finished
|
||||
/// </param>
|
||||
/// <returns>
|
||||
/// Result of the operation
|
||||
/// </returns>
|
||||
[HttpPut("rooms/{id}/unarchive")]
|
||||
public async Task<FileOperationDto> UnarchiveRoomAsync(T id)
|
||||
public async Task<FileOperationDto> UnarchiveRoomAsync(T id, ArchiveRoomRequestDto inDto)
|
||||
{
|
||||
ErrorIfNotDocSpace();
|
||||
|
||||
var destFolder = JsonSerializer.SerializeToElement(await _globalFolderHelper.FolderVirtualRoomsAsync);
|
||||
var movableRoom = JsonSerializer.SerializeToElement(id);
|
||||
|
||||
var operationResult = _fileStorageService.MoveOrCopyItems(new List<JsonElement> { movableRoom }, new List<JsonElement>(), destFolder, FileConflictResolveType.Skip, false, true)
|
||||
var operationResult = _fileStorageService.MoveOrCopyItems(new List<JsonElement> { movableRoom }, new List<JsonElement>(), destFolder, FileConflictResolveType.Skip, false, inDto.DeleteAfter)
|
||||
.FirstOrDefault();
|
||||
|
||||
return await _fileOperationDtoHelper.GetAsync(operationResult);
|
||||
|
Loading…
Reference in New Issue
Block a user