Diplomarbeit-Absolventenverein/oqtane.framework
10
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

Merge branch 'master' into master

Browse Source
This commit is contained in:
Shaun Walker
2020-03-19 12:10:12 -04:00
committed by GitHub
parent 18a843e74f ee42db7c39
commit 0c2d1d2449
16 changed files with 54 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2,6 +2,7 @@
using System.Linq;
using Microsoft.EntityFrameworkCore;
using Oqtane.Models;
using Oqtane.Shared;
namespace Oqtane.Repository
{
@ -18,7 +19,7 @@ namespace Oqtane.Repository
public IEnumerable<File> GetFiles(int folderId)
{
IEnumerable<Permission> permissions = _permissions.GetPermissions("Folder", folderId).ToList();
IEnumerable<Permission> permissions = _permissions.GetPermissions(EntityNames.Folder, folderId).ToList();
IEnumerable<File> files = _db.File.Where(item => item.FolderId == folderId).Include(item => item.Folder);
foreach (File file in files)
{
@ -46,7 +47,7 @@ namespace Oqtane.Repository
File file = _db.File.Where(item => item.FileId == fileId).Include(item => item.Folder).FirstOrDefault();
if (file != null)
{
IEnumerable<Permission> permissions = _permissions.GetPermissions("Folder", file.FolderId).ToList();
IEnumerable<Permission> permissions = _permissions.GetPermissions(EntityNames.Folder, file.FolderId).ToList();
file.Folder.Permissions = _permissions.EncodePermissions(permissions);
}
return file;