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

Browse Source 
--HG--
branch : dev
This commit is contained in:
Andre Rodrigues
2010-12-01 17:52:29 -08:00
parent d3eb21e8de 984cd638c5
commit 70e875d8c4
3 changed files with 27 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/Orchard.Web/Core/Contents/Controllers/AdminController.cs
View File

@@ -61,8 +61,8 @@ namespace Orchard.Core.Contents.Controllers {
: contentTypeDefinition.Name;
query = query.ForType(model.TypeName);
}
// content type and container filters are mutually exclusive
else if (model.ContainerId != null) {
if (model.ContainerId != null) {
query = query.Join<CommonPartRecord>().Where(cr => cr.Container.Id == model.ContainerId);
}

25
src/Orchard.Web/Core/Contents/Routes.cs
View File

@@ -16,13 +16,34 @@ namespace Orchard.Core.Contents {
new RouteDescriptor {
Priority = 5,
Route = new Route(
"Admin/Contents/List/InContainer/{containerId}",
"Admin/Contents/List/{id}/InContainer/{containerId}",
new RouteValueDictionary {
{"area", "Contents"},
{"controller", "Admin"},
{"action", "List"}
},
new RouteValueDictionary(),
new RouteValueDictionary {
{"id", @"\w+"},
{"containerId", @"\d+"}
},
new RouteValueDictionary {
{"area", "Contents"}
},
new MvcRouteHandler())
},
new RouteDescriptor {
Priority = 5,
Route = new Route(
"Admin/Contents/List/InContainer/{containerId}",
new RouteValueDictionary {
{"area", "Contents"},
{"controller", "Admin"},
{"action", "List"},
{"id", ""}
},
new RouteValueDictionary{
{"containerId", @"\d+"}
},
new RouteValueDictionary {
{"area", "Contents"}
},

4
src/Orchard.Web/Modules/Orchard.Lists/Views/Items/Content-List.SummaryAdmin.cshtml
View File

@@ -8,7 +8,7 @@
<div class="summary" itemscope="itemscope" itemid="@contentItem.Id" itemtype="http://orchardproject.net/data/ContentItem">
<div class="properties">
<input type="checkbox" value="@contentItem.Id" name="itemIds"/>
<h3>@Html.Link(contentItemMetadata.DisplayText, Url.Action("List", "Admin", new { area = "Contents", containerId = contentItem.Id }))</h3>
<h3>@Html.Link(contentItemMetadata.DisplayText, Url.Action("List", "Admin", new { area = "Contents", containerId = contentItem.Id, id = "" }))</h3>
@if (Model.Header != null) {
<div class="header">@Display(Model.Header)</div>
}
@@ -18,7 +18,7 @@
</div>
<div class="related">
@Display(Model.Actions)
@Html.Link(T("List Items").Text, Url.Action("List", "Admin", new { area = "Contents", containerId = contentItem.Id }))@T(" | ")
@Html.Link(T("List Items").Text, Url.Action("List", "Admin", new { area = "Contents", containerId = contentItem.Id, id = "" }))@T(" | ")
@Html.ItemEditLink(T("Edit").Text, contentItem) @T(" | ")
@Html.Link(T("Remove").Text, Url.Action("Remove", "Admin", new { area = "Contents", id = contentItem.Id, returnUrl }), new { itemprop = "RemoveUrl UnsafeUrl" })
</div>