Refactor host user security model, support static assets in modules and themes, module definition permissions and categories, paging control, remove SiteUsers, move seed data from script to site template for installation

This commit is contained in:
Shaun Walker
2019-09-19 16:33:48 -04:00
parent 35b9b9e89b
commit 83a212e7e3
61 changed files with 1000 additions and 979 deletions

View File

@ -1,19 +1,47 @@
namespace Oqtane.Models
using System;
using System.ComponentModel.DataAnnotations.Schema;
namespace Oqtane.Models
{
public class ModuleDefinition
public class ModuleDefinition : IAuditable
{
public int ModuleDefinitionId { get; set; }
public string ModuleDefinitionName { get; set; }
public string CreatedBy { get; set; }
public DateTime CreatedOn { get; set; }
public string ModifiedBy { get; set; }
public DateTime ModifiedOn { get; set; }
[NotMapped]
public string Name { get; set; }
[NotMapped]
public string Description { get; set; }
[NotMapped]
public string Categories { get; set; }
[NotMapped]
public string Version { get; set; }
[NotMapped]
public string Owner { get; set; }
[NotMapped]
public string Url { get; set; }
[NotMapped]
public string Contact { get; set; }
[NotMapped]
public string License { get; set; }
[NotMapped]
public string Dependencies { get; set; }
public string Permissions { get; set; }
[NotMapped]
public string PermissionNames { get; set; }
[NotMapped]
public string ControlTypeTemplate { get; set; }
[NotMapped]
public string ControlTypeRoutes { get; set; }
[NotMapped]
public string AssemblyName { get; set; }
[NotMapped]
public int SiteId { get; set; }
[NotMapped]
public string Permissions { get; set; }
}
}

View File

@ -0,0 +1,18 @@
namespace Oqtane.Models
{
public class PageTemplate
{
public string Name { get; set; }
public string Parent { get; set; }
public string Path { get; set; }
public int Order { get; set; }
public string Icon { get; set; }
public bool IsNavigation { get; set; }
public string PagePermissions { get; set; }
public string ModuleDefinitionName { get; set; }
public string ModulePermissions { get; set; }
public string Title { get; set; }
public string Pane { get; set; }
public string ContainerType { get; set; }
}
}

View File

@ -8,6 +8,7 @@ namespace Oqtane.Models
public string Name { get; set; }
public string Logo { get; set; }
public string DefaultThemeType { get; set; }
public string DefaultLayoutType { get; set; }
public string CreatedBy { get; set; }

View File

@ -1,18 +0,0 @@
using System;
namespace Oqtane.Models
{
public class SiteUser : IAuditable
{
public int SiteUserId { get; set; }
public int SiteId { get; set; }
public int UserId { get; set; }
public string CreatedBy { get; set; }
public DateTime CreatedOn { get; set; }
public string ModifiedBy { get; set; }
public DateTime ModifiedOn { get; set; }
public User User { get; set; }
}
}

View File

@ -9,7 +9,7 @@ namespace Oqtane.Models
public string Username { get; set; }
public string DisplayName { get; set; }
public string Email { get; set; }
public bool IsHost { get; set; }
[NotMapped]
public int SiteId { get; set; }
[NotMapped]

View File

@ -16,5 +16,7 @@ namespace Oqtane.Models
public DateTime ModifiedOn { get; set; }
public Role Role { get; set; }
public User User { get; set; }
}
}