Skip to content

Commit 389311e

Browse files
authored
Поправить проблему с кавычками в сюжетах (#3662)
1 parent 2cdc358 commit 389311e

File tree

2 files changed

+3
-5
lines changed

2 files changed

+3
-5
lines changed

src/JoinRpg.Portal/Views/Plot/EditElementPartial.cshtml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242

4343
}
4444
<span class="h4 @(Model.Status == PlotStatus.Deleted ? "s" : "")">
45-
<a role="button" data-toggle="collapse" data-parent="#elementsaccordion" href="#panelPlotElement@(Model.PlotElementId)">@Model.ShortContent.Value</a>
45+
<a role="button" data-toggle="collapse" data-parent="#elementsaccordion" href="#panelPlotElement@(Model.PlotElementId)">@Model.ShortContent</a>
4646
</span>
4747
@if (Model.HasMasterAccess)
4848
{

src/JoinRpg.WebPortal.Models/Plot/EditPlotFolderViewModel.cs

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
using JoinRpg.Services.Interfaces;
1414
using JoinRpg.Web.Helpers;
1515
using JoinRpg.Web.Plots;
16-
using Microsoft.AspNetCore.Components;
1716

1817
namespace JoinRpg.Web.Models.Plot;
1918

@@ -149,8 +148,7 @@ public PlotElementListItemViewModel(
149148
PlotFolderId = e.PlotFolderId;
150149
Status = e.GetStatus();
151150
ElementType = (PlotElementTypeView)e.ElementType;
152-
ShortContent = currentVersionText.Content.TakeWords(10).WithDefaultStringValue("***")
153-
.ToPlainTextAndEscapeHtml(renderer);
151+
ShortContent = currentVersionText.Content.TakeWords(10).WithDefaultStringValue("***").ToPlainTextWithoutHtmlEscape(renderer);
154152

155153
HasPlotEditorAccess = e.PlotFolder.HasMasterAccess(currentUserId, Permission.CanManagePlots) && e.Project.Active;
156154
HasMasterAccess = e.PlotFolder.HasMasterAccess(currentUserId);
@@ -182,7 +180,7 @@ public PlotElementListItemViewModel(
182180
[Display(Name = "Текст вводной"), UIHint("MarkdownString")]
183181
public JoinHtmlString Content { get; }
184182

185-
public MarkupString ShortContent { get; }
183+
public string ShortContent { get; }
186184

187185
[UIHint("EventTime")]
188186
public DateTime ModifiedDateTime { get; }

0 commit comments

Comments
 (0)