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

HtmlText null exception fix

Browse Source 
HtmlText Mode switch fix
Control panel fix

(cherry picked from commit b7d2cd0600)
This commit is contained in:
Pavel Vesely
2020-03-05 22:12:01 +01:00
parent 2c51c71527
commit ff18059b06
4 changed files with 22 additions and 8 deletions
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()

8
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;
@ -31,8 +33,10 @@ namespace Oqtane.Modules.HtmlText.Services
HtmlTextInfo htmltext;
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());
//because GetJsonAsync() returns an error if no content exists for the ModuleId ( https://github.com/aspnet/AspNetCore/issues/14041 )
//null value is transfered as empty list
var htmltextList = await _http.GetJsonAsync<List<HtmlTextInfo>>(apiurl + "/" + ModuleId.ToString() + "?entityid=" + ModuleId.ToString());
htmltext = htmltextList.FirstOrDefault();
}
catch
{