Merge branch 'master' into master

This commit is contained in:
Shaun Walker
2020-03-19 12:10:12 -04:00
committed by GitHub
16 changed files with 54 additions and 50 deletions

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;

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<Folder> GetFolders(int siteId)
{
IEnumerable<Permission> permissions = _permissions.GetPermissions(siteId, "Folder").ToList();
IEnumerable<Permission> permissions = _permissions.GetPermissions(siteId, EntityNames.Folder).ToList();
IEnumerable<Folder> folders = _db.Folder.Where(item => item.SiteId == siteId);
foreach(Folder folder in folders)
{
@ -31,7 +32,7 @@ namespace Oqtane.Repository
{
_db.Folder.Add(folder);
_db.SaveChanges();
_permissions.UpdatePermissions(folder.SiteId, "Folder", folder.FolderId, folder.Permissions);
_permissions.UpdatePermissions(folder.SiteId, EntityNames.Folder, folder.FolderId, folder.Permissions);
return folder;
}
@ -39,7 +40,7 @@ namespace Oqtane.Repository
{
_db.Entry(folder).State = EntityState.Modified;
_db.SaveChanges();
_permissions.UpdatePermissions(folder.SiteId, "Folder", folder.FolderId, folder.Permissions);
_permissions.UpdatePermissions(folder.SiteId, EntityNames.Folder, folder.FolderId, folder.Permissions);
return folder;
}
@ -48,7 +49,7 @@ namespace Oqtane.Repository
Folder folder = _db.Folder.Find(folderId);
if (folder != null)
{
IEnumerable<Permission> permissions = _permissions.GetPermissions("Folder", folder.FolderId).ToList();
IEnumerable<Permission> permissions = _permissions.GetPermissions(EntityNames.Folder, folder.FolderId).ToList();
folder.Permissions = _permissions.EncodePermissions(permissions);
}
return folder;
@ -59,7 +60,7 @@ namespace Oqtane.Repository
Folder folder = _db.Folder.Where(item => item.SiteId == siteId && item.Path == path).FirstOrDefault();
if (folder != null)
{
IEnumerable<Permission> permissions = _permissions.GetPermissions("Folder", folder.FolderId).ToList();
IEnumerable<Permission> permissions = _permissions.GetPermissions(EntityNames.Folder, folder.FolderId).ToList();
folder.Permissions = _permissions.EncodePermissions(permissions);
}
return folder;
@ -68,7 +69,7 @@ namespace Oqtane.Repository
public void DeleteFolder(int folderId)
{
Folder folder = _db.Folder.Find(folderId);
_permissions.DeletePermissions(folder.SiteId, "Folder", folderId);
_permissions.DeletePermissions(folder.SiteId, EntityNames.Folder, folderId);
_db.Folder.Remove(folder);
_db.SaveChanges();
}

View File

@ -35,14 +35,14 @@ namespace Oqtane.Repository
public void UpdateModuleDefinition(ModuleDefinition moduleDefinition)
{
_permissions.UpdatePermissions(moduleDefinition.SiteId, "ModuleDefinition", moduleDefinition.ModuleDefinitionId, moduleDefinition.Permissions);
_permissions.UpdatePermissions(moduleDefinition.SiteId, EntityNames.ModuleDefinition, moduleDefinition.ModuleDefinitionId, moduleDefinition.Permissions);
_cache.Remove("moduledefinitions");
}
public void DeleteModuleDefinition(int moduleDefinitionId, int siteId)
{
ModuleDefinition moduleDefinition = _db.ModuleDefinition.Find(moduleDefinitionId);
_permissions.DeletePermissions(siteId, "ModuleDefinition", moduleDefinitionId);
_permissions.DeletePermissions(siteId, EntityNames.ModuleDefinition, moduleDefinitionId);
_db.ModuleDefinition.Remove(moduleDefinition);
_db.SaveChanges();
_cache.Remove("moduledefinitions");
@ -60,7 +60,7 @@ namespace Oqtane.Repository
});
// get module defintion permissions for site
List<Permission> permissions = _permissions.GetPermissions(siteId, "ModuleDefinition").ToList();
List<Permission> permissions = _permissions.GetPermissions(siteId, EntityNames.ModuleDefinition).ToList();
// get module definitions in database
List<ModuleDefinition> moduledefs = _db.ModuleDefinition.ToList();
@ -75,14 +75,14 @@ namespace Oqtane.Repository
moduledef = new ModuleDefinition { ModuleDefinitionName = moduledefinition.ModuleDefinitionName };
_db.ModuleDefinition.Add(moduledef);
_db.SaveChanges();
_permissions.UpdatePermissions(siteId, "ModuleDefinition", moduledef.ModuleDefinitionId, moduledefinition.Permissions);
_permissions.UpdatePermissions(siteId, EntityNames.ModuleDefinition, moduledef.ModuleDefinitionId, moduledefinition.Permissions);
}
else
{
// existing module definition
if (permissions.Count == 0)
{
_permissions.UpdatePermissions(siteId, "ModuleDefinition", moduledef.ModuleDefinitionId, moduledefinition.Permissions);
_permissions.UpdatePermissions(siteId, EntityNames.ModuleDefinition, moduledef.ModuleDefinitionId, moduledefinition.Permissions);
}
else
{
@ -102,7 +102,7 @@ namespace Oqtane.Repository
// any remaining module definitions are orphans
foreach (ModuleDefinition moduledefinition in moduledefs)
{
_permissions.DeletePermissions(siteId, "ModuleDefinition", moduledefinition.ModuleDefinitionId);
_permissions.DeletePermissions(siteId, EntityNames.ModuleDefinition, moduledefinition.ModuleDefinitionId);
_db.ModuleDefinition.Remove(moduledefinition); // delete
}

View File

@ -2,6 +2,7 @@
using System.Linq;
using Microsoft.EntityFrameworkCore;
using Oqtane.Models;
using Oqtane.Shared;
namespace Oqtane.Repository
{
@ -20,7 +21,7 @@ namespace Oqtane.Repository
public IEnumerable<Page> GetPages(int siteId)
{
IEnumerable<Permission> permissions = _permissions.GetPermissions(siteId, "Page").ToList();
IEnumerable<Permission> permissions = _permissions.GetPermissions(siteId, EntityNames.Page).ToList();
IEnumerable<Page> pages = _db.Page.Where(item => item.SiteId == siteId && item.UserId == null);
foreach(Page page in pages)
{
@ -33,7 +34,7 @@ namespace Oqtane.Repository
{
_db.Page.Add(page);
_db.SaveChanges();
_permissions.UpdatePermissions(page.SiteId, "Page", page.PageId, page.Permissions);
_permissions.UpdatePermissions(page.SiteId, EntityNames.Page, page.PageId, page.Permissions);
return page;
}
@ -41,7 +42,7 @@ namespace Oqtane.Repository
{
_db.Entry(page).State = EntityState.Modified;
_db.SaveChanges();
_permissions.UpdatePermissions(page.SiteId, "Page", page.PageId, page.Permissions);
_permissions.UpdatePermissions(page.SiteId, EntityNames.Page, page.PageId, page.Permissions);
return page;
}
@ -50,7 +51,7 @@ namespace Oqtane.Repository
Page page = _db.Page.Find(pageId);
if (page != null)
{
IEnumerable<Permission> permissions = _permissions.GetPermissions("Page", page.PageId).ToList();
IEnumerable<Permission> permissions = _permissions.GetPermissions(EntityNames.Page, page.PageId).ToList();
page.Permissions = _permissions.EncodePermissions(permissions);
}
return page;
@ -68,7 +69,7 @@ namespace Oqtane.Repository
}
if (page != null)
{
IEnumerable<Permission> permissions = _permissions.GetPermissions("Page", page.PageId).ToList();
IEnumerable<Permission> permissions = _permissions.GetPermissions(EntityNames.Page, page.PageId).ToList();
page.Permissions = _permissions.EncodePermissions(permissions);
}
}
@ -80,7 +81,7 @@ namespace Oqtane.Repository
Page page = _db.Page.Where(item => item.Path == path && item.SiteId == siteId).FirstOrDefault();
if (page != null)
{
IEnumerable<Permission> permissions = _permissions.GetPermissions("Page", page.PageId).ToList();
IEnumerable<Permission> permissions = _permissions.GetPermissions(EntityNames.Page, page.PageId).ToList();
page.Permissions = _permissions.EncodePermissions(permissions);
}
return page;
@ -89,7 +90,7 @@ namespace Oqtane.Repository
public void DeletePage(int pageId)
{
Page page = _db.Page.Find(pageId);
_permissions.DeletePermissions(page.SiteId, "Page", pageId);
_permissions.DeletePermissions(page.SiteId, EntityNames.Page, pageId);
IEnumerable<PageModule> pageModules = _db.PageModule.Where(item => item.PageId == pageId).ToList();
foreach (var pageModule in pageModules)
{