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

fixed date format in room history

Browse Source
This commit is contained in:
Maksim Chegulov 2023-04-05 16:54:33 +03:00
parent b54dd7c4f3
commit cd87de9540
4 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
products/ASC.Files/Service/Core/FilesModule.cs
View File

@ -159,7 +159,7 @@ public class FilesModule : FeedModule
if (shareRecord != null)
{
var feed = new Feed.Aggregator.Feed(shareRecord.Owner, shareRecord.TimeStamp, true)
var feed = new Feed.Aggregator.Feed(shareRecord.Owner, shareRecord.TimeStamp)
{
Item = SharedFileItem,
ItemId = $"{file.Id}_{shareRecord.Subject}",
@ -180,8 +180,9 @@ public class FilesModule : FeedModule
}
var updated = file.Version != 1;
var fileModifiedUtc = file.ModifiedOn.ToUniversalTime();
return new Feed.Aggregator.Feed(file.ModifiedBy, file.ModifiedOn, true)
return new Feed.Aggregator.Feed(file.ModifiedBy, fileModifiedUtc)
{
Item = FileItem,
ItemId = $"{file.Id}_{(file.Version > 1 ? file.Version : 0)}",
@ -194,7 +195,7 @@ public class FilesModule : FeedModule
AdditionalInfo = file.ContentLengthString,
AdditionalInfo2 = file.Encrypted ? "Encrypted" : string.Empty,
Keywords = file.Title,
GroupId = GetGroupId(FileItem, file.ModifiedBy, file.ModifiedOn, file.ParentId.ToString(), updated ? 1 : 0),
GroupId = GetGroupId(FileItem, file.ModifiedBy, fileModifiedUtc, file.ParentId.ToString(), updated ? 1 : 0),
ContextId = contextId
};
}

8
products/ASC.Files/Service/Core/FoldersModule.cs
View File

@ -119,7 +119,7 @@ public class FoldersModule : FeedModule
if (shareRecord != null)
{
var feed = new Feed.Aggregator.Feed(shareRecord.Owner, shareRecord.TimeStamp, true)
var feed = new Feed.Aggregator.Feed(shareRecord.Owner, shareRecord.TimeStamp)
{
Item = SharedFolderItem,
ItemId = $"{folder.Id}_{shareRecord.Subject}",
@ -137,7 +137,9 @@ public class FoldersModule : FeedModule
return feed;
}
return new Feed.Aggregator.Feed(folder.CreateBy, folder.CreateOn)
var folderCreatedUtc = folder.CreateOn.ToUniversalTime();
return new Feed.Aggregator.Feed(folder.CreateBy, folderCreatedUtc)
{
Item = FolderItem,
ItemId = folder.Id.ToString(),
@ -147,7 +149,7 @@ public class FoldersModule : FeedModule
ExtraLocationTitle = parentFolder.Title,
ExtraLocation = folder.ParentId.ToString(),
Keywords = folder.Title,
GroupId = GetGroupId(FolderItem, folder.CreateBy, folder.CreateOn, folder.ParentId.ToString()),
GroupId = GetGroupId(FolderItem, folder.CreateBy, folderCreatedUtc, folder.ParentId.ToString()),
ContextId = contextId
};
}

6
products/ASC.Files/Service/Core/RoomsModule.cs
View File

@ -111,7 +111,9 @@ public class RoomsModule : FeedModule
if (shareRecord == null)
{
return new Feed.Aggregator.Feed(room.CreateBy, room.CreateOn)
var roomCreatedUtc = room.CreateOn.ToUniversalTime();
return new Feed.Aggregator.Feed(room.CreateBy, roomCreatedUtc)
{
Item = RoomItem,
ItemId = room.Id.ToString(),
@ -123,7 +125,7 @@ public class RoomsModule : FeedModule
Keywords = room.Title,
AdditionalInfo = ((int)room.FolderType).ToString(),
AdditionalInfo4 = room.Private ? "private" : null,
GroupId = GetGroupId(RoomItem, room.CreateBy, room.CreateOn, room.ParentId.ToString())
GroupId = GetGroupId(RoomItem, room.CreateBy, roomCreatedUtc, room.ParentId.ToString())
};
}

2
products/ASC.Files/Service/Core/UsersModule.cs
View File

@ -68,7 +68,7 @@ public class UsersModule : FeedModule
{
var fullName = _displayUserSettingsHelper.GetFullUserName(u);
var feed = new Feed.Aggregator.Feed(u.Id, u.LastModified, true)
var feed = new Feed.Aggregator.Feed(u.Id, u.LastModified.ToUniversalTime(), true)
{
Item = UserItem,
ItemId = u.Id.ToString(),