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 : 1.x
This commit is contained in:
Sebastien Ros
2013-02-04 11:35:08 -08:00
parent 2dfca7a776 274e3b9067
commit 68e25288a7
2 changed files with 13 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Orchard.Web/Modules/Orchard.Indexing/Services/IndexService.cs
View File

@@ -38,7 +38,7 @@ namespace Orchard.Indexing.Services
UpdateIndex(indexName);
}
else {
Services.Notifier.Warning(T("The index {0} could no ben rebuilt. It might already be in use, please try again later.", indexName));
Services.Notifier.Warning(T("The index {0} could not be rebuilt. It might already be in use, please try again later.", indexName));
}
}

12
src/Orchard/UI/Navigation/MenuItemComparer.cs
View File

@@ -36,6 +36,18 @@ namespace Orchard.UI.Navigation {
return false;
}
if (!string.IsNullOrWhiteSpace(x.Position) && !string.IsNullOrWhiteSpace(y.Position)) {
var xPosSplitted = x.Position.Split('.').Where(ss => ss != "0").ToArray();
var yPosSplitted = y.Position.Split('.').Where(ss => ss != "0").ToArray();
var xParentPosition = xPosSplitted.Length > 0 ? string.Join(".", xPosSplitted.Take(xPosSplitted.Length - 1)) : null;
var yParentPosition = yPosSplitted.Length > 0 ? string.Join(".", yPosSplitted.Take(yPosSplitted.Length - 1)) : null;
if (!string.Equals(xParentPosition, yParentPosition))
{
return false;
}
}
return true;
}