lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2026-02-09 09:16:41 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Merge pull request #5526 from yw80/1.9.x

Browse Source 
Correct code indentation format for file IndexingTaskExecutor.cs
This commit is contained in:
Nicholas Mayne
2015-07-19 17:53:25 +01:00
parent 1732c333c2 e72d226263
commit 1e62b2b9f8
2 changed files with 16 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Orchard.Web/Modules/Orchard.DesignerTools/Views/ShapeTracingTemplates.cshtml
+1 -1
View File
@@ -27,7 +27,7 @@
<li class="sgd-s"><div class="name">@T("Shape").Text</div><div class="value">${shape.type}</div></li> <li class="sgd-s"><div class="name">@T("Shape").Text</div><div class="value">${shape.type}</div></li>
<li class="sgd-t"><div class="name">@T("Active Template").Text</div><div class="value"><a id="activeTemplate" href="#">${shape.template}</a></div></li> <li class="sgd-t"><div class="name">@T("Active Template").Text</div><div class="value"><a id="activeTemplate" href="#">${shape.template}</a></div></li>
{{if shape.template != shape.originalTemplate}} {{if shape.template != shape.originalTemplate}}
<li class="sgd-ot"><div class="name">@T("Original Template").Text Template</div><div class="value">${shape.originalTemplate}</div></li> <li class="sgd-ot"><div class="name">@T("Original Template").Text</div><div class="value">${shape.originalTemplate}</div></li>
{{/if}} {{/if}}
<li class="sgd-d"><div class="name">@T("Display Type").Text</div><div class="value">${shape.displayType}</div></li> <li class="sgd-d"><div class="name">@T("Display Type").Text</div><div class="value">${shape.displayType}</div></li>
<li class="sgd-a"><div class="name">@T("Alternate ({0})", "${shape.alternates.length}").Text</div> <li class="sgd-a"><div class="name">@T("Alternate ({0})", "${shape.alternates.length}").Text</div>
src/Orchard.Web/Modules/Orchard.Indexing/Services/IndexingTaskExecutor.cs
+15 -16
View File
@@ -176,18 +176,18 @@ namespace Orchard.Indexing.Services {
var settings = GetTypeIndexingSettings(item); var settings = GetTypeIndexingSettings(item);
// skip items from types which are not indexed // skip items from types which are not indexed
if (settings.List.Contains(indexName)) { if (settings.List.Contains(indexName)) {
if (item.HasPublished()) { if (item.HasPublished()) {
var published = _contentManager.Get(item.Id, VersionOptions.Published); var published = _contentManager.Get(item.Id, VersionOptions.Published);
IDocumentIndex documentIndex = ExtractDocumentIndex(published); IDocumentIndex documentIndex = ExtractDocumentIndex(published);
if (documentIndex != null && documentIndex.IsDirty) { if (documentIndex != null && documentIndex.IsDirty) {
addToIndex.Add(documentIndex); addToIndex.Add(documentIndex);
}
} }
} }
} else if (settings.List.Contains(indexName + ":latest")) {
else if (settings.List.Contains(indexName + ":latest")) {
IDocumentIndex documentIndex = ExtractDocumentIndex(item); IDocumentIndex documentIndex = ExtractDocumentIndex(item);
if (documentIndex != null && documentIndex.IsDirty) { if (documentIndex != null && documentIndex.IsDirty) {
@@ -207,8 +207,7 @@ namespace Orchard.Indexing.Services {
} }
else { else {
_transactionManager.RequireNew(); _transactionManager.RequireNew();
} }
} while (loop); } while (loop);
} }
@@ -240,10 +239,10 @@ namespace Orchard.Indexing.Services {
if (settings.List.Contains(indexName)) { if (settings.List.Contains(indexName)) {
documentIndex = ExtractDocumentIndex(item.ContentItem); documentIndex = ExtractDocumentIndex(item.ContentItem);
} }
else if (settings.List.Contains(indexName + ":latest")) { else if (settings.List.Contains(indexName + ":latest")) {
var latest = _contentManager.Get(item.Id, VersionOptions.Latest); var latest = _contentManager.Get(item.Id, VersionOptions.Latest);
documentIndex = ExtractDocumentIndex(latest); documentIndex = ExtractDocumentIndex(latest);
} }
} }
if (documentIndex == null || item.Delete) { if (documentIndex == null || item.Delete) {
@@ -266,8 +265,8 @@ namespace Orchard.Indexing.Services {
else { else {
_transactionManager.RequireNew(); _transactionManager.RequireNew();
} }
}
while (loop); } while (loop);
} }
// save current state of the index // save current state of the index