Diplomarbeit-Absolventenverein/oqtane.framework-not-mirrored
Archived
9
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #3380 from sbwalker/dev

Browse Source 
resolve issue in making Pager search work with sorting
This commit is contained in:
Shaun Walker 2023-10-16 08:03:42 -04:00 committed by GitHub
commit 767fa78e22
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Oqtane.Client/Modules/Controls/Pager.razor
View File

@ -295,6 +295,10 @@
if (!string.IsNullOrEmpty(SearchProperties)) if (!string.IsNullOrEmpty(SearchProperties))
{ {
AllItems = Items; // only used in search AllItems = Items; // only used in search
if (!string.IsNullOrEmpty(_search))
{
Search();
}
} }
if (!string.IsNullOrEmpty(PageSize)) if (!string.IsNullOrEmpty(PageSize))

6
Oqtane.Server/Repository/FileRepository.cs
View File

@ -32,8 +32,9 @@ namespace Oqtane.Repository
public IEnumerable<File> GetFiles(int folderId, bool tracking) public IEnumerable<File> GetFiles(int folderId, bool tracking)
{ {
var alias = _tenants.GetAlias(); var folder = _folderRepository.GetFolder(folderId, false);
IEnumerable<Permission> permissions = _permissions.GetPermissions(alias.SiteId, EntityNames.Folder, folderId).ToList(); IEnumerable<Permission> permissions = _permissions.GetPermissions(folder.SiteId, EntityNames.Folder, folderId).ToList();
IEnumerable<File> files; IEnumerable<File> files;
if (tracking) if (tracking)
{ {
@ -46,6 +47,7 @@ namespace Oqtane.Repository
foreach (File file in files) foreach (File file in files)
{ {
file.Folder.PermissionList = permissions.ToList(); file.Folder.PermissionList = permissions.ToList();
var alias = _tenants.GetAlias();
file.Url = GetFileUrl(file, alias); file.Url = GetFileUrl(file, alias);
} }
return files; return files;