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

#18720: Fixing shape tracing issue with Projection pager

Browse Source 
Work Item: 18720

--HG--
branch : 1.x
This commit is contained in:
Sebastien Ros
2012-06-30 11:13:50 -07:00
parent b224aa0ed1
commit aa7360b94e
2 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.hgsubstate
View File

@@ -8,5 +8,5 @@ c77d9dafaa25a31b302877282a169cb9a0dd06b8 src/Orchard.Web/Modules/Orchard.Rules
419399ef2e37122a000e6cc8674148d3183d7032 src/Orchard.Web/Modules/Orchard.TaskLease 419399ef2e37122a000e6cc8674148d3183d7032 src/Orchard.Web/Modules/Orchard.TaskLease
0c67b238df7d3758c30ce43b6293d85b1cc18e9a src/Orchard.Web/Modules/Orchard.Tokens 0c67b238df7d3758c30ce43b6293d85b1cc18e9a src/Orchard.Web/Modules/Orchard.Tokens
67dfa347443abf0b9cd266250bdeb97a6a12717e src/orchard.web/Modules/Orchard.Alias 67dfa347443abf0b9cd266250bdeb97a6a12717e src/orchard.web/Modules/Orchard.Alias
3965133f9a0cb060be8414b215ae7c867889a276 src/orchard.web/Modules/Orchard.Projections 13f5f86332a11060323f93ca8d06b1414c7706ed src/orchard.web/Modules/Orchard.Projections
aefccf4a2bc96af34bde4b9f86fd62d0523cf40f src/orchard.web/modules/Orchard.Fields aefccf4a2bc96af34bde4b9f86fd62d0523cf40f src/orchard.web/modules/Orchard.Fields

16
src/Orchard.Web/Core/Shapes/CoreShapes.cs
View File

@@ -562,10 +562,18 @@ namespace Orchard.Core.Shapes {
} }
[Shape] [Shape]
public IHtmlString Pager_Link(dynamic Shape, dynamic Display) { public IHtmlString Pager_Link(HtmlHelper Html, dynamic Shape, dynamic Display, object Value) {
Shape.Metadata.Alternates.Clear(); var RouteValues = (object)Shape.RouteValues;
Shape.Metadata.Type = "ActionLink"; RouteValueDictionary rvd;
return Display(Shape); if (RouteValues == null) {
rvd = new RouteValueDictionary();
}
else {
rvd = RouteValues is RouteValueDictionary ? (RouteValueDictionary)RouteValues : new RouteValueDictionary(RouteValues);
}
string value = Html.Encode(Value is string ? (string)Value : Display(Value));
return @Html.ActionLink(value, (string)rvd["action"], (string)rvd["controller"], rvd, null);
} }
[Shape] [Shape]