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

Merge branch 'master' into feature/files

Browse Source
This commit is contained in:
Daniil Senkiv 2020-03-19 09:16:47 +03:00
commit d5f75d3f77
1 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
products/ASC.Files/Server/Controllers/FilesController.cs
View File

@ -202,9 +202,9 @@ namespace ASC.Api.Documents
/// <category>Folders</category> /// <category>Folders</category>
/// <returns>My folder contents</returns> /// <returns>My folder contents</returns>
[Read("@my")] [Read("@my")]
public FolderContentWrapper GetMyFolder(Guid userIdOrGroupId, FilterType filterType) public FolderContentWrapper GetMyFolder(Guid userIdOrGroupId, FilterType filterType, bool withsubfolders)
{ {
return ToFolderContentWrapper(GlobalFolderHelper.FolderMy, userIdOrGroupId, filterType); return ToFolderContentWrapper(GlobalFolderHelper.FolderMy, userIdOrGroupId, filterType, withsubfolders);
} }
/// <summary> /// <summary>
@ -216,9 +216,9 @@ namespace ASC.Api.Documents
/// <category>Folders</category> /// <category>Folders</category>
/// <returns>Projects folder contents</returns> /// <returns>Projects folder contents</returns>
[Read("@projects")] [Read("@projects")]
public FolderContentWrapper GetProjectsFolder(Guid userIdOrGroupId, FilterType filterType) public FolderContentWrapper GetProjectsFolder(Guid userIdOrGroupId, FilterType filterType, bool withsubfolders)
{ {
return ToFolderContentWrapper(GlobalFolderHelper.FolderProjects, userIdOrGroupId, filterType); return ToFolderContentWrapper(GlobalFolderHelper.FolderProjects, userIdOrGroupId, filterType, withsubfolders);
} }
@ -231,9 +231,9 @@ namespace ASC.Api.Documents
/// <category>Folders</category> /// <category>Folders</category>
/// <returns>Common folder contents</returns> /// <returns>Common folder contents</returns>
[Read("@common")] [Read("@common")]
public FolderContentWrapper GetCommonFolder(Guid userIdOrGroupId, FilterType filterType) public FolderContentWrapper GetCommonFolder(Guid userIdOrGroupId, FilterType filterType, bool withsubfolders)
{ {
return ToFolderContentWrapper(GlobalFolderHelper.FolderCommon, userIdOrGroupId, filterType); return ToFolderContentWrapper(GlobalFolderHelper.FolderCommon, userIdOrGroupId, filterType, withsubfolders);
} }
/// <summary> /// <summary>
@ -245,9 +245,9 @@ namespace ASC.Api.Documents
/// <category>Folders</category> /// <category>Folders</category>
/// <returns>Shared folder contents</returns> /// <returns>Shared folder contents</returns>
[Read("@share")] [Read("@share")]
public FolderContentWrapper GetShareFolder(Guid userIdOrGroupId, FilterType filterType) public FolderContentWrapper GetShareFolder(Guid userIdOrGroupId, FilterType filterType, bool withsubfolders)
{ {
return ToFolderContentWrapper(GlobalFolderHelper.FolderShare, userIdOrGroupId, filterType); return ToFolderContentWrapper(GlobalFolderHelper.FolderShare, userIdOrGroupId, filterType, withsubfolders);
} }
/// <summary> /// <summary>
@ -259,9 +259,9 @@ namespace ASC.Api.Documents
/// <category>Folders</category> /// <category>Folders</category>
/// <returns>Trash folder contents</returns> /// <returns>Trash folder contents</returns>
[Read("@trash")] [Read("@trash")]
public FolderContentWrapper GetTrashFolder(Guid userIdOrGroupId, FilterType filterType) public FolderContentWrapper GetTrashFolder(Guid userIdOrGroupId, FilterType filterType, bool withsubfolders)
{ {
return ToFolderContentWrapper(GlobalFolderHelper.FolderTrash, userIdOrGroupId, filterType); return ToFolderContentWrapper(GlobalFolderHelper.FolderTrash, userIdOrGroupId, filterType, withsubfolders);
} }
/// <summary> /// <summary>
@ -276,9 +276,9 @@ namespace ASC.Api.Documents
/// <param name="filterType" optional="true" remark="Allowed values: None (0), FilesOnly (1), FoldersOnly (2), DocumentsOnly (3), PresentationsOnly (4), SpreadsheetsOnly (5) or ImagesOnly (7)">Filter type</param> /// <param name="filterType" optional="true" remark="Allowed values: None (0), FilesOnly (1), FoldersOnly (2), DocumentsOnly (3), PresentationsOnly (4), SpreadsheetsOnly (5) or ImagesOnly (7)">Filter type</param>
/// <returns>Folder contents</returns> /// <returns>Folder contents</returns>
[Read("{folderId}", order: int.MaxValue)] [Read("{folderId}", order: int.MaxValue)]
public FolderContentWrapper GetFolder(string folderId, Guid userIdOrGroupId, FilterType filterType) public FolderContentWrapper GetFolder(string folderId, Guid userIdOrGroupId, FilterType filterType, bool withsubfolders)
{ {
return ToFolderContentWrapper(folderId, userIdOrGroupId, filterType).NotFoundIfNull(); return ToFolderContentWrapper(folderId, userIdOrGroupId, filterType, withsubfolders).NotFoundIfNull();
} }
@ -1528,7 +1528,7 @@ namespace ASC.Api.Documents
} }
private FolderContentWrapper ToFolderContentWrapper(object folderId, Guid userIdOrGroupId, FilterType filterType) private FolderContentWrapper ToFolderContentWrapper(object folderId, Guid userIdOrGroupId, FilterType filterType, bool withsubfolders)
{ {
SortedByType sortBy; SortedByType sortBy;
if (!Enum.TryParse(ApiContext.SortBy, true, out sortBy)) if (!Enum.TryParse(ApiContext.SortBy, true, out sortBy))
@ -1542,7 +1542,7 @@ namespace ASC.Api.Documents
userIdOrGroupId.ToString(), userIdOrGroupId.ToString(),
ApiContext.FilterValue, ApiContext.FilterValue,
false, false,
false, withsubfolders,
new OrderBy(sortBy, !ApiContext.SortDescending)), new OrderBy(sortBy, !ApiContext.SortDescending)),
startIndex); startIndex);
} }