IlyaSobolev/DocSpace-client
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' into bugfix/new-selector

Browse Source
This commit is contained in:
Timofey Boyko 2023-08-17 15:43:25 +03:00
commit 7136ca9eca
2 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
common/Tools/ASC.Migrations.Core/Core/MigrationGenerator.cs
View File

@ -57,7 +57,7 @@ public class MigrationGenerator
var name = GenerateMigrationName();
var migration = scaffolder.ScaffoldMigration(name, $"ASC.Migrations.{_providerName}.SaaS");
var migration = scaffolder.ScaffoldMigration(name, $"ASC.Migrations.{_providerName}.SaaS", "Migrations");
SaveMigration(migration);
}

14
products/ASC.Files/Server/Api/SettingsController.cs
View File

@ -317,6 +317,20 @@ public class SettingsController : ApiControllerBase
return await _fileStorageService.UpdateIfExistAsync(inDto.Set);
}
/// <summary>
/// Get the trash bin auto-clearing setting.
/// </summary>
/// <short>Get the trash bin auto-clearing setting</short>
/// <category>Settings</category>
/// <returns type="ASC.Files.Core.AutoCleanUpData, ASC.Files.Core">The auto-clearing setting properties: auto-clearing or not, a time interval when the auto-clearing will be performed</returns>
/// <path>api/2.0/files/settings/autocleanup</path>
/// <httpMethod>GET</httpMethod>
[HttpGet("settings/autocleanup")]
public AutoCleanUpData GetAutomaticallyCleanUp()
{
return _fileStorageService.GetSettingsAutomaticallyCleanUp();
}
/// <summary>
/// Updates the trash bin auto-clearing setting.
/// </summary>