kocoded/oqtane.framework
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

modifications to ActionLink and ActionDialog controls, added logic to prevent IHostedService from blocking startup, made controller route prefix consistent in module template

Browse Source
This commit is contained in:
Shaun Walker 2020-07-17 15:09:05 -04:00
parent b02bdee8cb
commit bc73e5e3d0
6 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Oqtane.Client/Modules/Controls/ActionDialog.razor
View File

@ -40,7 +40,7 @@
@code {
private bool _visible = false;
private bool _editmode = true;
private bool _editmode = false;
private bool _authorized = false;
private string _iconSpan = string.Empty;
@ -66,7 +66,7 @@
public bool Disabled { get; set; } // optional
[Parameter]
public string EditMode { get; set; } // optional - specifies if a user must be in edit mode to see the action - default is true
public string EditMode { get; set; } // optional - specifies if an authorized user must be in edit mode to see the action - default is false
[Parameter]
public Action OnClick { get; set; } // required if an Action is specified - executes a method in the calling component
@ -84,6 +84,7 @@
{
Class = "btn btn-success";
}
if (!string.IsNullOrEmpty(EditMode))
{
_editmode = bool.Parse(EditMode);
@ -100,7 +101,7 @@
private bool IsAuthorized()
{
bool authorized = false;
if (PageState.EditMode || _editmode)
if (PageState.EditMode || !_editmode)
{
SecurityAccessLevel security = SecurityAccessLevel.Host;
if (Security == null)

6
Oqtane.Client/Modules/Controls/ActionLink.razor
View File

@ -20,7 +20,7 @@
private string _parameters = string.Empty;
private string _classname = "btn btn-primary";
private string _style = string.Empty;
private bool _editmode = true;
private bool _editmode = false;
private bool _authorized = false;
private string _iconSpan = string.Empty;
@ -46,7 +46,7 @@
public bool Disabled { get; set; } // optional
[Parameter]
public string EditMode { get; set; } // optional - specifies if a user must be in edit mode to see the action - default is true
public string EditMode { get; set; } // optional - specifies if an authorized user must be in edit mode to see the action - default is false.
[Parameter]
public string IconName { get; set; } // optional - specifies an icon for the link - default is no icon
@ -100,7 +100,7 @@
private bool IsAuthorized()
{
var authorized = false;
if (PageState.EditMode || _editmode)
if (PageState.EditMode || !_editmode)
{
var security = SecurityAccessLevel.Host;
if (Security == null)

4
Oqtane.Client/Modules/HtmlText/Index.razor
View File

@ -7,12 +7,12 @@
@if (PageState.EditMode)
{
<br /><ActionLink Action="Edit" EditMode="false" /><br /><br />
<br /><ActionLink Action="Edit" EditMode="true" /><br /><br />
}
@code {
public override List<Resource> Resources => new List<Resource>()
{
{
new Resource { ResourceType = ResourceType.Stylesheet, Url = ModulePath() + "Module.css" }
};

2
Oqtane.Server/Infrastructure/Jobs/HostedServiceBase.cs
View File

@ -27,6 +27,8 @@ namespace Oqtane.Infrastructure
protected async Task ExecuteAsync(CancellationToken stoppingToken)
{
await Task.Yield(); // required so that this method does not block startup
try
{
while (!stoppingToken.IsCancellationRequested)

2
Oqtane.Server/wwwroot/Modules/Templates/External/Server/Controllers/[Module]Controller.cs vendored
View File

@ -10,7 +10,7 @@ using [Owner].[Module]s.Repository;
namespace [Owner].[Module]s.Controllers
{
[Route("{site}/api/[controller]")]
[Route("{alias}/api/[controller]")]
public class [Module]Controller : Controller
{
private readonly I[Module]Repository _[Module]s;

2
Oqtane.Server/wwwroot/Modules/Templates/Internal/Oqtane.Server/Modules/[Owner].[Module]s/Controllers/[Module]Controller.cs
View File

@ -10,7 +10,7 @@ using [Owner].[Module]s.Repository;
namespace [Owner].[Module]s.Controllers
{
[Route("{site}/api/[controller]")]
[Route("{alias}/api/[controller]")]
public class [Module]Controller : Controller
{
private readonly I[Module]Repository _[Module]s;