Files: added new audit actions, refactor
This commit is contained in:
parent
4d929ef43e
commit
0c7410814d
@ -2664,6 +2664,22 @@ public class FileStorageService<T> //: IFileStorageService
|
||||
|
||||
var folderDao = GetFolderDao();
|
||||
var room = (await folderDao.GetFolderAsync(roomId)).NotFoundIfNull();
|
||||
var messageAction = MessageAction.RoomLinkCreated;
|
||||
|
||||
if (share == FileShare.None)
|
||||
{
|
||||
messageAction = MessageAction.RoomLinkDeleted;
|
||||
}
|
||||
else
|
||||
{
|
||||
var linkExist = (await _fileSecurity.GetSharesAsync(room))
|
||||
.Any(r => r.Subject == linkId && r.SubjectType == SubjectType.InvitationLink);
|
||||
|
||||
if (linkExist)
|
||||
{
|
||||
messageAction = MessageAction.RoomLinkUpdated;
|
||||
}
|
||||
}
|
||||
|
||||
var aces = new List<AceWrapper>
|
||||
{
|
||||
@ -2685,7 +2701,7 @@ public class FileStorageService<T> //: IFileStorageService
|
||||
var (changed, _) = await _fileSharingAceHelper.SetAceObjectAsync(aces, room, false, null, null);
|
||||
if (changed)
|
||||
{
|
||||
_ = _filesMessageService.Send(room, GetHttpHeaders(), MessageAction.RoomLinkUpdate, room.Title, GetAccessString(share));
|
||||
_ = _filesMessageService.Send(room, GetHttpHeaders(), messageAction, room.Title, GetAccessString(share));
|
||||
}
|
||||
}
|
||||
catch (Exception e)
|
||||
@ -3391,6 +3407,7 @@ public class FileStorageService<T> //: IFileStorageService
|
||||
case FileShare.Restrict:
|
||||
case FileShare.RoomAdmin:
|
||||
case FileShare.Editing:
|
||||
case FileShare.Collaborator:
|
||||
case FileShare.None:
|
||||
return FilesCommonResource.ResourceManager.GetString("AceStatusEnum_" + fileShare.ToStringFast());
|
||||
default:
|
||||
|
@ -68,6 +68,15 @@ namespace ASC.Files.Core.Resources {
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Looks up a localized string similar to Collaborator.
|
||||
/// </summary>
|
||||
public static string AceStatusEnum_Collaborator {
|
||||
get {
|
||||
return ResourceManager.GetString("AceStatusEnum_Collaborator", resourceCulture);
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Looks up a localized string similar to Comment.
|
||||
/// </summary>
|
||||
|
@ -469,4 +469,7 @@ Highest compatibility with docx, xlsx, pptx. </value>
|
||||
<data name="RoleEnum_Collaborator" xml:space="preserve">
|
||||
<value>Collaborator</value>
|
||||
</data>
|
||||
<data name="AceStatusEnum_Collaborator" xml:space="preserve">
|
||||
<value>Collaborator</value>
|
||||
</data>
|
||||
</root>
|
Loading…
Reference in New Issue
Block a user