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

HtmlText null exception fix

Browse Source 
HtmlText Mode switch fix
Control panel fix
This commit is contained in:
Pavel Vesely 2020-03-05 22:12:01 +01:00
parent e74f0d7644
commit b7d2cd0600
4 changed files with 20 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -70,8 +70,8 @@ else
public override SecurityAccessLevel SecurityAccessLevel { get { return SecurityAccessLevel.Edit; } }
public override string Title { get { return "Edit Html/Text"; } }
RichTextEditor RichTextEditorHtml;
bool RichTextEditorMode = true;
RichTextEditor RichTextEditorHtml;
string content;
string createdby;
DateTime createdon;
@ -117,13 +117,20 @@ else
private async Task RichTextEditor()
{
RichTextEditorMode = true;
await LoadText();
//TODO: maybe exists better solution than delay. Without this editor becomes corrupted.
await Task.Delay(100);
await RichTextEditorHtml.LoadContent(content);
StateHasChanged();
}
private async Task RawHTMLEditor()
{
if (RichTextEditorMode)
{
content = await this.RichTextEditorHtml.GetHTML();
}
RichTextEditorMode = false;
await LoadText();
// await LoadText();
}
private async Task SaveContent()

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

@ -1,3 +1,5 @@
using System.Collections.Generic;
using System.Linq;
using System.Threading.Tasks;
using System.Net.Http;
using Microsoft.AspNetCore.Components;
@ -32,7 +34,8 @@ namespace Oqtane.Modules.HtmlText.Services
try
{
// exception handling is required because GetJsonAsync() returns an error if no content exists for the ModuleId ( https://github.com/aspnet/AspNetCore/issues/14041 )
htmltext = await http.GetJsonAsync<HtmlTextInfo>(apiurl + "/" + ModuleId.ToString() + "?entityid=" + ModuleId.ToString());
var htmltextList = await http.GetJsonAsync<List<HtmlTextInfo>>(apiurl + "/" + ModuleId.ToString() + "?entityid=" + ModuleId.ToString());
htmltext = htmltextList.FirstOrDefault();
}
catch
{

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

@ -317,7 +317,7 @@
}
PageModule pagemodule = new PageModule();
pagemodule.PageId = (pageid != "-") ? PageState.Page.PageId : int.Parse(pageid);
pagemodule.PageId = (pageid == "-") ? PageState.Page.PageId : int.Parse(pageid);
pagemodule.ModuleId = int.Parse(moduleid);
pagemodule.Title = title;
if (pagemodule.Title == "")

7
Oqtane.Server/Modules/HtmlText/Controllers/HtmlTextController.cs
View File

@ -6,6 +6,7 @@ using Microsoft.AspNetCore.Http;
using Oqtane.Infrastructure;
using Oqtane.Shared;
using System;
using System.Collections.Generic;
namespace Oqtane.Modules.HtmlText.Controllers
{
@ -29,22 +30,24 @@ namespace Oqtane.Modules.HtmlText.Controllers
// GET api/<controller>/5
[HttpGet("{id}")]
[Authorize(Policy = "ViewModule")]
public HtmlTextInfo Get(int id)
public List<HtmlTextInfo> Get(int id)
{
var list = new List<HtmlTextInfo>();
try
{
HtmlTextInfo HtmlText = null;
if (EntityId == id)
{
HtmlText = htmltext.GetHtmlText(id);
list.Add(HtmlText);
}
return HtmlText;
}
catch (Exception ex)
{
logger.Log(LogLevel.Error, this, LogFunction.Read, ex, "Get Error {Error}", ex.Message);
throw;
}
return list;
}
// POST api/<controller>