lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2025-10-15 19:54:57 +08:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Merge pull request #5313 from Skrypt/fixed-#5281

Browse Source 
Fixing #5281
This commit is contained in:
Sébastien Ros
2015-05-28 12:19:48 -07:00
parent 53e58f60fe 6eb9e0d457
commit 52038c677e
5 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Orchard.Web/Core/Navigation/Views/Admin/Index.cshtml
View File

@@ -22,7 +22,7 @@
<label for="menuId">@T("Current Menu:")</label> <label for="menuId">@T("Current Menu:")</label>
<select id="menuId" name="menuId"> <select id="menuId" name="menuId">
@foreach (var menu in Model.Menus) { @foreach (var menu in Model.Menus) {
@Html.SelectOption(Model.CurrentMenu.Id, menu.Id, Convert.ToString(Html.ItemDisplayText(menu))) @Html.SelectOption(Model.CurrentMenu.Id, menu.Id, Convert.ToString(Html.ItemDisplayText(menu, false)))
} }
</select> </select>
@if (hasPermission) { @if (hasPermission) {

2
src/Orchard.Web/Core/Navigation/Views/EditorTemplates/Parts.MenuWidget.Edit.cshtml
View File

@@ -6,7 +6,7 @@
@Html.LabelFor(m => m.CurrentMenuId, T("For Menu")) @Html.LabelFor(m => m.CurrentMenuId, T("For Menu"))
<select id="@Html.FieldIdFor(m => m.CurrentMenuId)" name="@Html.FieldNameFor(m => m.CurrentMenuId)"> <select id="@Html.FieldIdFor(m => m.CurrentMenuId)" name="@Html.FieldNameFor(m => m.CurrentMenuId)">
@foreach(ContentItem menu in Model.Menus) { @foreach(ContentItem menu in Model.Menus) {
@Html.SelectOption(Model.CurrentMenuId, menu.Id, Html.ItemDisplayText(menu).ToString()) @Html.SelectOption(Model.CurrentMenuId, menu.Id, Html.ItemDisplayText(menu, false).ToString())
} }
</select> </select>
<span class="hint">@T("Select which menu you want to display")</span> <span class="hint">@T("Select which menu you want to display")</span>

2
src/Orchard.Web/Core/Navigation/Views/EditorTemplates/Parts.Navigation.Menu.Edit.cshtml
View File

@@ -11,7 +11,7 @@
<div data-controllerid="@Html.FieldIdFor(m => m.OnMenu)" class=""> <div data-controllerid="@Html.FieldIdFor(m => m.OnMenu)" class="">
<select id="@Html.FieldIdFor(m => m.CurrentMenuId)" name="@Html.FieldNameFor(m => m.CurrentMenuId)"> <select id="@Html.FieldIdFor(m => m.CurrentMenuId)" name="@Html.FieldNameFor(m => m.CurrentMenuId)">
@foreach (ContentItem menu in Model.Menus) { @foreach (ContentItem menu in Model.Menus) {
@Html.SelectOption(Model.CurrentMenuId, menu.Id, Html.ItemDisplayText(menu).ToString()) @Html.SelectOption(Model.CurrentMenuId, menu.Id, Html.ItemDisplayText(menu, false).ToString())
} }
</select> </select>
<span class="hint">@T("Select which menu you want the content item to be displayed on.")</span> <span class="hint">@T("Select which menu you want the content item to be displayed on.")</span>

2
src/Orchard.Web/Modules/Orchard.ContentPicker/Views/EditorTemplates/Parts.Navigation.Edit.cshtml
View File

@@ -29,7 +29,7 @@
<div data-controllerid="@Html.FieldIdFor(m => m.AddMenuItem)"> <div data-controllerid="@Html.FieldIdFor(m => m.AddMenuItem)">
<select id="@Html.FieldIdFor(m => m.CurrentMenuId)" name="@Html.FieldNameFor(m => m.CurrentMenuId)"> <select id="@Html.FieldIdFor(m => m.CurrentMenuId)" name="@Html.FieldNameFor(m => m.CurrentMenuId)">
@foreach (ContentItem menu in Model.Menus) { @foreach (ContentItem menu in Model.Menus) {
@Html.SelectOption(Model.CurrentMenuId, menu.Id, Html.ItemDisplayText(menu).ToString()) @Html.SelectOption(Model.CurrentMenuId, menu.Id, Html.ItemDisplayText(menu, false).ToString())
} }
</select> </select>
<span class="hint">@T("Select which menu you want the content item to be added on.")</span> <span class="hint">@T("Select which menu you want the content item to be added on.")</span>

8
src/Orchard/Mvc/Html/ContentItemExtensions.cs
View File

@@ -7,11 +7,15 @@ using Orchard.Utility.Extensions;
namespace Orchard.Mvc.Html { namespace Orchard.Mvc.Html {
public static class ContentItemExtensions { public static class ContentItemExtensions {
public static MvcHtmlString ItemDisplayText(this HtmlHelper html, IContent content) { public static MvcHtmlString ItemDisplayText(this HtmlHelper html, IContent content, bool encode = true) {
var metadata = content.ContentItem.ContentManager.GetItemMetadata(content); var metadata = content.ContentItem.ContentManager.GetItemMetadata(content);
if (metadata.DisplayText == null) if (metadata.DisplayText == null)
return null; return null;
return MvcHtmlString.Create(html.Encode(metadata.DisplayText)); if (encode) {
return MvcHtmlString.Create(html.Encode(metadata.DisplayText));
} else {
return MvcHtmlString.Create(metadata.DisplayText);
}
} }
public static MvcHtmlString ItemDisplayLink(this HtmlHelper html, IContent content) { public static MvcHtmlString ItemDisplayLink(this HtmlHelper html, IContent content) {