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

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

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

53
Oqtane.Client/Themes/Controls/ControlPanel.razor
View File

@ -6,7 +6,7 @@
@using Oqtane.Shared
@using Oqtane.Security
@namespace Oqtane.Themes.Controls
@inherits ThemeObjectBase
@inherits ThemeControlBase
@inject NavigationManager NavigationManager
@inject IUserService UserService
@inject IModuleDefinitionService ModuleDefinitionService
@ -40,11 +40,21 @@
<td>
@if (moduledefinitions != null)
{
<select class="form-control" @onchange="(e => CategoryChanged(e))">
<option value="-">&lt;Common Modules&gt;</option>
@foreach (var category in categories)
{
<option value="@category">@category</option>
}
</select>
<select class="form-control" @bind="@moduledefinitionname">
<option value="">&lt;Select Module&gt;</option>
@foreach (var moduledefinition in moduledefinitions)
{
<option value="@moduledefinition.ModuleDefinitionName">@moduledefinition.Name</option>
if (moduledefinition.Permissions == "[]" || UserSecurity.IsAuthorized(PageState.User, "Utilize", moduledefinition.Permissions))
{
<option value="@moduledefinition.ModuleDefinitionName">@moduledefinition.Name</option>
}
}
</select>
}
@ -115,9 +125,11 @@
}
@code {
List<string> categories = new List<string>();
List<ModuleDefinition> moduledefinitions;
Dictionary<string, string> containers = new Dictionary<string, string>();
int pagemanagementmoduleid = -1;
string category = "";
string moduledefinitionname = "";
string pane = "";
string title = "";
@ -127,7 +139,20 @@
{
if (UserSecurity.IsAuthorized(PageState.User, "Edit", PageState.Page.Permissions))
{
moduledefinitions = PageState.ModuleDefinitions;
foreach(ModuleDefinition moduledefinition in PageState.ModuleDefinitions)
{
if (moduledefinition.Categories != "")
{
foreach(string category in moduledefinition.Categories.Split(','))
{
if (!categories.Contains(category))
{
categories.Add(category);
}
}
}
}
moduledefinitions = PageState.ModuleDefinitions.Where(item => item.Categories == "").ToList();
containers = ThemeService.GetContainerTypes(PageState.Themes);
List<Module> modules = await ModuleService.GetModulesAsync(PageState.Site.SiteId, Constants.PageManagementModule);
if (modules.Count > 0)
@ -137,6 +162,21 @@
}
}
private void CategoryChanged(ChangeEventArgs e)
{
string category = (string)e.Value;
if (category == "-")
{
moduledefinitions = PageState.ModuleDefinitions.Where(item => item.Categories == "").ToList();
}
else
{
moduledefinitions = PageState.ModuleDefinitions.Where(item => item.Categories.Contains(e.Value.ToString())).ToList();
}
moduledefinitionname = "";
StateHasChanged();
}
private async Task AddModule()
{
if (UserSecurity.IsAuthorized(PageState.User, "Edit", PageState.Page.Permissions))
@ -145,14 +185,11 @@
module.SiteId = PageState.Site.SiteId;
module.ModuleDefinitionName = moduledefinitionname;
module.Permissions = PageState.Page.Permissions;
await ModuleService.AddModuleAsync(module);
List<Module> modules = await ModuleService.GetModulesAsync(PageState.Site.SiteId, moduledefinitionname);
int ModuleId = modules.LastOrDefault().ModuleId;
module = await ModuleService.AddModuleAsync(module);
PageModule pagemodule = new PageModule();
pagemodule.PageId = PageState.Page.PageId;
pagemodule.ModuleId = ModuleId;
pagemodule.ModuleId = module.ModuleId;
if (title == "")
{
title = moduledefinitions.Where(item => item.ModuleDefinitionName == moduledefinitionname).FirstOrDefault().Name;

4
Oqtane.Client/Themes/Controls/Login.razor
View File

@ -6,7 +6,7 @@
@using Oqtane.Shared
@using Microsoft.JSInterop
@namespace Oqtane.Themes.Controls
@inherits ThemeObjectBase
@inherits ThemeControlBase
@inject NavigationManager NavigationManager
@inject IUserService UserService
@inject IJSRuntime jsRuntime
@ -33,7 +33,7 @@
{
returnurl += "/" + PageState.Page.Path;
}
NavigationManager.NavigateTo("login?returnurl=" + returnurl);
NavigationManager.NavigateTo(NavigateUrl("login", "returnurl=" + returnurl));
}
private async Task LogoutUser()

2
Oqtane.Client/Themes/Controls/Logo.razor
View File

@ -1,7 +1,7 @@
@using Microsoft.AspNetCore.Components.Web
@using Oqtane.Themes
@namespace Oqtane.Themes.Controls
@inherits ThemeObjectBase
@inherits ThemeControlBase
@((MarkupString)logo)

4
Oqtane.Client/Themes/Controls/Menu.razor
View File

@ -5,7 +5,7 @@
@using Oqtane.Models;
@using Oqtane.Security
@namespace Oqtane.Themes.Controls
@inherits ThemeObjectBase
@inherits ThemeControlBase
@inject IUserService UserService
@if (menu != "")
@ -37,7 +37,7 @@
}
if (p.Icon != "")
{
menu += "<span class=\"oi " + p.Icon + "\" aria-hidden=\"true\"></span>";
menu += "<span class=\"oi oi-" + p.Icon + "\" aria-hidden=\"true\"></span>";
}
menu += p.Name;
menu += "</a>\n";

2
Oqtane.Client/Themes/Controls/Profile.razor
View File

@ -2,7 +2,7 @@
@using Microsoft.AspNetCore.Components.Web
@using Oqtane.Themes
@namespace Oqtane.Themes.Controls
@inherits ThemeObjectBase
@inherits ThemeControlBase
@inject NavigationManager NavigationManager
<AuthorizeView>

19
Oqtane.Client/Themes/ThemeBase.cs
View File

@ -10,6 +10,11 @@ namespace Oqtane.Themes
public virtual string Name { get; set; }
public virtual string Panes { get; set; }
public string ThemePath()
{
return "Themes/" + this.GetType().Namespace + "/";
}
public string NavigateUrl()
{
return NavigateUrl(PageState.Page.Path);
@ -40,5 +45,19 @@ namespace Oqtane.Themes
return Utilities.NavigateUrl(PageState.Alias.Path, path, parameters, reload);
}
public string EditUrl(int moduleid, string action)
{
return EditUrl(moduleid, action, "");
}
public string EditUrl(int moduleid, string action, string parameters)
{
return EditUrl(PageState.Page.Path, moduleid, action, parameters);
}
public string EditUrl(string path, int moduleid, string action, string parameters)
{
return Utilities.EditUrl(PageState.Alias.Path, path, moduleid, action, parameters);
}
}
}

2
Oqtane.Client/Themes/ThemeObjectBase.cs → Oqtane.Client/Themes/ThemeControlBase.cs
View File

@ -3,7 +3,7 @@ using Oqtane.Shared;
namespace Oqtane.Themes
{
public class ThemeObjectBase : ComponentBase
public class ThemeControlBase : ComponentBase
{
[CascadingParameter]
protected PageState PageState { get; set; }