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

Merge pull request #6038 from sbwalker/dev

Browse Source 
modifications for page attributes
This commit is contained in:
Shaun Walker
2026-02-13 16:57:11 -05:00
committed by GitHub
parent de5725b92c 657c6620d5
commit 5bf5d2d515
1 changed files with 22 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
Oqtane.Server/Repository/ModuleDefinitionRepository.cs
View File

@@ -445,15 +445,11 @@ namespace Oqtane.Repository
var pageTemplate = new PageTemplate(); var pageTemplate = new PageTemplate();
pageTemplate.AliasName = "*"; pageTemplate.AliasName = "*";
pageTemplate.Version = "*"; pageTemplate.Version = "*";
pageTemplate.Name = route.Substring(1); pageTemplate.Path = route.Substring(1);
pageTemplate.Update = false; pageTemplate.Update = false;
pageTemplate.PageTemplateModules = new List<PageTemplateModule>()
{
new PageTemplateModule { Title = route.Substring(1), Order = 1 }
};
pageTemplate.PermissionList = new List<Permission>();
// check for Authorize attributes // check for Authorize attributes
var permissionList = new List<Permission>();
var authorizeAttributes = modulecontroltype.GetCustomAttributes(typeof(AuthorizeAttribute), true).Cast<AuthorizeAttribute>(); var authorizeAttributes = modulecontroltype.GetCustomAttributes(typeof(AuthorizeAttribute), true).Cast<AuthorizeAttribute>();
if (authorizeAttributes != null && authorizeAttributes.Any()) if (authorizeAttributes != null && authorizeAttributes.Any())
{ {
@@ -462,7 +458,7 @@ namespace Oqtane.Repository
if (string.IsNullOrEmpty(authorizeAttribute.Roles)) if (string.IsNullOrEmpty(authorizeAttribute.Roles))
{ {
// [Authorize] // [Authorize]
pageTemplate.PermissionList.Add(new Permission(PermissionNames.View, RoleNames.Registered, true)); permissionList.Add(new Permission(PermissionNames.View, RoleNames.Registered, true));
} }
else else
{ {
@@ -476,25 +472,37 @@ namespace Oqtane.Repository
permissionName = roleName.Substring(0, roleName.IndexOf(":") - 1); permissionName = roleName.Substring(0, roleName.IndexOf(":") - 1);
roleName = roleName.Substring(roleName.IndexOf(":") + 1); roleName = roleName.Substring(roleName.IndexOf(":") + 1);
} }
pageTemplate.PermissionList.Add(new Permission(permissionName, roleName, true)); permissionList.Add(new Permission(permissionName, roleName, true));
} }
} }
} }
} }
else else
{ {
// default view permission // view permission
pageTemplate.PermissionList.Add(new Permission(PermissionNames.View, RoleNames.Everyone, true)); permissionList.Add(new Permission(PermissionNames.View, RoleNames.Everyone, true));
} }
if (!pageTemplate.PermissionList.Any(item => item.PermissionName == PermissionNames.Edit && item.RoleName == RoleNames.Admin)) // default permissions
if (!permissionList.Any(item => item.PermissionName == PermissionNames.View && item.RoleName == RoleNames.Admin))
{ {
// default edit permission permissionList.Add(new Permission(PermissionNames.View, RoleNames.Admin, true));
pageTemplate.PermissionList.Add(new Permission(PermissionNames.Edit, RoleNames.Admin, true));
} }
if (!permissionList.Any(item => item.PermissionName == PermissionNames.Edit && item.RoleName == RoleNames.Admin))
{
permissionList.Add(new Permission(PermissionNames.Edit, RoleNames.Admin, true));
}
pageTemplate.PermissionList = permissionList;
// add module instance
var pageTemplateModule = new PageTemplateModule();
pageTemplateModule.Title = route.Substring(1);
pageTemplateModule.PermissionList = permissionList;
pageTemplate.PageTemplateModules = new List<PageTemplateModule>();
pageTemplate.PageTemplateModules.Add(pageTemplateModule);
// use pagetemplate if not already defined in IModule
if (moduledefinition.PageTemplates == null) if (moduledefinition.PageTemplates == null)
{ {
// use pagetemplate if not already defined in IModule
moduledefinition.PageTemplates = new List<PageTemplate>(); moduledefinition.PageTemplates = new List<PageTemplate>();
moduledefinition.PageTemplates.Add(pageTemplate); moduledefinition.PageTemplates.Add(pageTemplate);
} }