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

Files: fix error messages

Browse Source
This commit is contained in:
Maksim Chegulov 2022-04-15 17:37:53 +03:00
parent 858d93366d
commit 6a8b33f780
3 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
products/ASC.Files/Core/Resources/FilesCommonResource.Designer.cs generated
View File

@ -783,9 +783,18 @@ namespace ASC.Files.Core.Resources {
/// <summary>
/// Looks up a localized string similar to You don&apos;t have enough permission to archive the room.
/// </summary>
public static string ErrorMessage_ArchivingFolder {
public static string ErrorMessage_ArchiveRoom {
get {
return ResourceManager.GetString("ErrorMessage_ArchivingFolder", resourceCulture);
return ResourceManager.GetString("ErrorMessage_ArchiveRoom", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to You don&apos;t have enough permission to archive the room.
/// </summary>
public static string ErrorMessage_UnarchiveRoom {
get {
return ResourceManager.GetString("ErrorMessage_UnarchiveRoom", resourceCulture);
}
}

5
products/ASC.Files/Core/Resources/FilesCommonResource.resx
View File

@ -357,7 +357,10 @@
<data name="ErrorMassage_ViewTrashItem" xml:space="preserve">
<value>You are not allowed to preview the elements in the Trash</value>
</data>
<data name="ErrorMessage_ArchivingFolder" xml:space="preserve">
<data name="ErrorMessage_ArchiveRoom" xml:space="preserve">
<value>You don't have enough permission to archive the room</value>
</data>
<data name="ErrorMessage_UnarchiveRoom" xml:space="preserve">
<value>You don't have enough permission to archive the room</value>
</data>
<data name="ErrorMessage_UpdateArchivedRoom" xml:space="preserve">

6
products/ASC.Files/Core/Services/WCFService/FileOperations/FileMoveCopyOperation.cs
View File

@ -243,15 +243,15 @@ class FileMoveCopyOperation<T> : FileOperation<FileMoveCopyOperationData<T>, T>
}
else if (!isRoom && (toFolder.FolderType != FolderType.VirtualRooms || toFolder.FolderType != FolderType.Archive))
{
Error = FilesCommonResource.ErrorMessage_ArchivingFolder;
Error = FilesCommonResource.ErrorMassage_SecurityException_MoveFolder;
}
else if (isRoom && toFolder.FolderType != FolderType.VirtualRooms && !await FilesSecurity.CanEditRoomAsync(folder))
{
Error = FilesCommonResource.ErrorMessage_ArchivingFolder;
Error = FilesCommonResource.ErrorMessage_UnarchiveRoom;
}
else if (isRoom && toFolder.FolderType != FolderType.Archive && !await FilesSecurity.CanReadAsync(folder))
{
Error = FilesCommonResource.ErrorMessage_ArchivingFolder;
Error = FilesCommonResource.ErrorMessage_ArchiveRoom;
}
else if (folder.RootFolderType == FolderType.Privacy
&& (copy || toFolder.RootFolderType != FolderType.Privacy))