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

Merge pull request #4055 from sbwalker/dev

Browse Source 
fix regression issue caused by #3985 related to ActionLink
This commit is contained in:
Shaun Walker 2024-03-23 11:39:24 -04:00 committed by GitHub
commit b8a0f34c33
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -97,11 +97,14 @@
{ {
base.OnParametersSet(); base.OnParametersSet();
_text = Action;
if (!string.IsNullOrEmpty(Text)) if (!string.IsNullOrEmpty(Text))
{ {
_text = Localize(nameof(Text), _text); _text = Localize(nameof(Text), _text);
} }
else
{
_text = Localize(nameof(Action), Action);
}
if (IconOnly && !string.IsNullOrEmpty(IconName)) if (IconOnly && !string.IsNullOrEmpty(IconName))
{ {

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

@ -13,6 +13,13 @@
@((MarkupString)content) @((MarkupString)content)
@if (PageState.EditMode && content.Length > 1000)
{
<div class="text-center mt-2">
<ActionLink Action="Edit" EditMode="true" ResourceKey="Edit" />
</div>
}
@code { @code {
private string content = ""; private string content = "";

6
Oqtane.Client/Resources/Modules/HtmlText/Index.resx
View File

@ -118,10 +118,10 @@
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader> </resheader>
<data name="Edit.Action" xml:space="preserve"> <data name="Edit.Action" xml:space="preserve">
<value>Edit</value> <value>Edit Content</value>
</data> </data>
<data name="Edit.Text" xml:space="preserve"> <data name="Edit.Text" xml:space="preserve">
<value>Edit</value> <value>Edit Content</value>
</data> </data>
<data name="Error.Content.Load" xml:space="preserve"> <data name="Error.Content.Load" xml:space="preserve">
<value>An Error Occurred Loading Content</value> <value>An Error Occurred Loading Content</value>