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

Merge pull request #466 from sbwalker/master

Browse Source 
updated HtmlText module to use dependency injection
This commit is contained in:
Shaun Walker 2020-05-12 15:04:01 -04:00 committed by GitHub
commit ad70128747
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 11 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Oqtane.Client/Modules/HtmlText/Edit.razor
View File

@ -3,9 +3,8 @@
@using Oqtane.Modules.Controls @using Oqtane.Modules.Controls
@namespace Oqtane.Modules.HtmlText @namespace Oqtane.Modules.HtmlText
@inherits ModuleBase @inherits ModuleBase
@inject IHtmlTextService HtmlTextService
@inject NavigationManager NavigationManager @inject NavigationManager NavigationManager
@inject HttpClient http
@inject SiteState sitestate
@if (_content != null) @if (_content != null)
{ {
@ -14,7 +13,8 @@
<NavLink class="btn btn-secondary" href="@NavigateUrl()">Cancel</NavLink> <NavLink class="btn btn-secondary" href="@NavigateUrl()">Cancel</NavLink>
@if (!string.IsNullOrEmpty(_content)) @if (!string.IsNullOrEmpty(_content))
{ {
<br /><br /> <br />
<br />
<AuditInfo CreatedBy="@_createdby" CreatedOn="@_createdon" ModifiedBy="@_modifiedby" ModifiedOn="@_modifiedon"></AuditInfo> <AuditInfo CreatedBy="@_createdby" CreatedOn="@_createdon" ModifiedBy="@_modifiedby" ModifiedOn="@_modifiedon"></AuditInfo>
} }
} }
@ -35,8 +35,7 @@
{ {
try try
{ {
var htmltextservice = new HtmlTextService(http, sitestate); var htmltext = await HtmlTextService.GetHtmlTextAsync(ModuleState.ModuleId);
var htmltext = await htmltextservice.GetHtmlTextAsync(ModuleState.ModuleId);
if (htmltext != null) if (htmltext != null)
{ {
_content = htmltext.Content; _content = htmltext.Content;
@ -65,19 +64,18 @@
try try
{ {
var htmltextservice = new HtmlTextService(http, sitestate); var htmltext = await HtmlTextService.GetHtmlTextAsync(ModuleState.ModuleId);
var htmltext = await htmltextservice.GetHtmlTextAsync(ModuleState.ModuleId);
if (htmltext != null) if (htmltext != null)
{ {
htmltext.Content = content; htmltext.Content = content;
await htmltextservice.UpdateHtmlTextAsync(htmltext); await HtmlTextService.UpdateHtmlTextAsync(htmltext);
} }
else else
{ {
htmltext = new HtmlTextInfo(); htmltext = new HtmlTextInfo();
htmltext.ModuleId = ModuleState.ModuleId; htmltext.ModuleId = ModuleState.ModuleId;
htmltext.Content = content; htmltext.Content = content;
await htmltextservice.AddHtmlTextAsync(htmltext); await HtmlTextService.AddHtmlTextAsync(htmltext);
} }
await logger.LogInformation("Html/Text Content Saved {HtmlText}", htmltext); await logger.LogInformation("Html/Text Content Saved {HtmlText}", htmltext);

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

@ -1,21 +1,13 @@
@using Oqtane.Modules.HtmlText.Services @using Oqtane.Modules.HtmlText.Services
@using Oqtane.Modules.HtmlText.Models
@namespace Oqtane.Modules.HtmlText @namespace Oqtane.Modules.HtmlText
@inherits ModuleBase @inherits ModuleBase
@inject NavigationManager NavigationManager @inject IHtmlTextService HtmlTextService
@inject HttpClient http
@inject SiteState sitestate
@((MarkupString)content) @((MarkupString)content)
@if (PageState.EditMode) @if (PageState.EditMode)
{ {
<br /> <br /><ActionLink Action="Edit" /><br /><br />
}
<ActionLink Action="Edit" />
@if (PageState.EditMode)
{
<br /><br />
} }
@code { @code {
@ -25,8 +17,7 @@
{ {
try try
{ {
var htmltextservice = new HtmlTextService(http, sitestate); var htmltext = await HtmlTextService.GetHtmlTextAsync(ModuleState.ModuleId);
var htmltext = await htmltextservice.GetHtmlTextAsync(ModuleState.ModuleId);
if (htmltext != null) if (htmltext != null)
{ {
content = htmltext.Content; content = htmltext.Content;

2
Oqtane.Client/Modules/HtmlText/Services/HtmlTextService.cs
View File

@ -8,7 +8,7 @@ using Oqtane.Shared;
namespace Oqtane.Modules.HtmlText.Services namespace Oqtane.Modules.HtmlText.Services
{ {
public class HtmlTextService : ServiceBase, IHtmlTextService public class HtmlTextService : ServiceBase, IHtmlTextService, IService
{ {
private readonly SiteState _siteState; private readonly SiteState _siteState;