lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2025-12-03 20:13:52 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge

Browse Source 
--HG--
branch : dev
This commit is contained in:
Renaud Paquay
2010-07-13 22:28:07 -07:00
parent a12c27ba80 12d2a94718
commit ea462577ba
4 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Orchard.Web/Core/Contents/AdminMenu.cs
View File

@@ -21,7 +21,7 @@ namespace Orchard.Core.Contents {
var contentTypeDefinitions = _contentDefinitionManager.ListTypeDefinitions().OrderBy(d => d.Name);
builder.Add(T("Content"), "1", menu => {
menu.Add(T("Manage Content"), "1.2", item => item.Action("List", "Admin", new { area = "Contents" }));
menu.Add(T("Manage Content"), "1", item => item.Action("List", "Admin", new { area = "Contents" }));
foreach (var contentTypeDefinition in contentTypeDefinitions) {
var ci = _contentManager.New(contentTypeDefinition.Name);
var cim = _contentManager.GetItemMetadata(ci);

6
src/Orchard.Web/Core/Routable/Drivers/RoutableDriver.cs
View File

@@ -55,7 +55,7 @@ namespace Orchard.Core.Routable.Drivers {
};
// TEMP: path format patterns replaces this logic
var path = part.Record.Path;
var path = part.Path;
if (path != null && path.EndsWith(part.Slug)) {
model.DisplayLeadingPath = path.Substring(0, path.Length - part.Slug.Length);
}
@@ -73,10 +73,10 @@ namespace Orchard.Core.Routable.Drivers {
// TEMP: path format patterns replaces this logic
var containerSlug = GetContainerSlug(part);
if (string.IsNullOrEmpty(containerSlug)) {
part.Record.Path = model.Slug;
part.Path = model.Slug;
}
else {
part.Record.Path = containerSlug + "/" + model.Slug;
part.Path = containerSlug + "/" + model.Slug;
}
if (!_routableService.IsSlugValid(part.Slug)) {

4
src/Orchard.Web/Core/Routable/Handlers/RoutableHandler.cs
View File

@@ -12,7 +12,7 @@ namespace Orchard.Core.Routable.Handlers {
_routablePathConstraint = routablePathConstraint;
Filters.Add(StorageFilter.For(repository));
OnPublished<IsRoutable>((context, routable) => _routablePathConstraint.AddPath(routable.Record.Path));
OnPublished<IsRoutable>((context, routable) => _routablePathConstraint.AddPath(routable.Path));
}
}
public class IsRoutableHandler : ContentHandlerBase {
@@ -23,7 +23,7 @@ namespace Orchard.Core.Routable.Handlers {
{"Area", "Routable"},
{"Controller", "Item"},
{"Action", "Display"},
{"path", routable.Record.Path}
{"path", routable.Path}
};
}
}

4
src/Orchard.Web/Modules/Orchard.ContentTypes/AdminMenu.cs
View File

@@ -9,8 +9,8 @@ namespace Orchard.ContentTypes {
public void GetNavigation(NavigationBuilder builder) {
builder.Add(T("Site Configuration"), "11",
menu => menu.Add(T("Content Types"), "3", item => item.Action("Index", "Admin", new { area = "Orchard.ContentTypes" })));
builder.Add(T("Content"), "1",
menu => menu.Add(T("Manage Content Types"), "1.1", item => item.Action("Index", "Admin", new { area = "Orchard.ContentTypes" })));
}
}
}