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

Fix bug 16417.

Browse Source 
See http://orchard.codeplex.com/WorkItem/View.aspx?WorkItemId=16417

We considering the list of conflicting slug, we should ignore the current
content item...

--HG--
branch : dev
This commit is contained in:
Renaud Paquay
2010-05-13 13:01:58 -07:00
parent e876cf8928
commit 632fb4c863
2 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Orchard.Web/Core/Common/Services/IRoutableService.cs
View File

@@ -11,7 +11,7 @@ namespace Orchard.Core.Common.Services {
/// <summary>
/// Returns any content item of the specified content type with similar slugs
/// </summary>
string[] GetSimilarSlugs(string contentType, string slug);
IEnumerable<RoutableAspect> GetSimilarSlugs(string contentType, string slug);
/// <summary>
/// Validates the given slug

15
src/Orchard.Web/Core/Common/Services/RoutableService.cs
View File

@@ -63,13 +63,13 @@ namespace Orchard.Core.Common.Services {
: null;
}
public string[] GetSimilarSlugs(string contentType, string slug)
public IEnumerable<RoutableAspect> GetSimilarSlugs(string contentType, string slug)
{
return
_contentManager.Query(contentType).Join<RoutableRecord>()
.List()
.Select(i => i.As<RoutableAspect>().Slug)
.Where(rr => rr.StartsWith(slug, StringComparison.OrdinalIgnoreCase)) // todo: for some reason the filter doesn't work within the query, even without StringComparison or StartsWith
.Select(i => i.As<RoutableAspect>())
.Where(routable => routable.Slug.StartsWith(slug, StringComparison.OrdinalIgnoreCase)) // todo: for some reason the filter doesn't work within the query, even without StringComparison or StartsWith
.ToArray();
}
@@ -89,12 +89,17 @@ namespace Orchard.Core.Common.Services {
var slugsLikeThis = GetSimilarSlugs(part.ContentItem.ContentType, part.Slug);
// If the part is already a valid content item, don't include it in the list
// of slug to consider for conflict detection
if (part.ContentItem.Id != 0)
slugsLikeThis = slugsLikeThis.Where(p => p.ContentItem.Id != part.ContentItem.Id);
//todo: (heskew) need better messages
if (slugsLikeThis.Length > 0)
if (slugsLikeThis.Count() > 0)
{
var originalSlug = part.Slug;
//todo: (heskew) make auto-uniqueness optional
part.Slug = GenerateUniqueSlug(part.Slug, slugsLikeThis);
part.Slug = GenerateUniqueSlug(part.Slug, slugsLikeThis.Select(p => p.Slug));
if (originalSlug != part.Slug) {
return false;