From 8dd6b5290910f06f93e88e0448574b38b57e4ae3 Mon Sep 17 00:00:00 2001
From: Sipke Schoorstra <sipke@ideliverable.com>
Date: Tue, 21 Jul 2015 16:08:07 +0100
Subject: [PATCH] Minor Autoroute cleanup.

---
 .../Orchard.Autoroute/Handlers/AutoroutePartHandler.cs |  4 +---
 .../Modules/Orchard.Autoroute/Orchard.Autoroute.csproj |  4 +---
 .../Orchard.Autoroute/Services/AutorouteService.cs     | 10 ----------
 .../Services/PathResolutionService.cs                  |  5 ++---
 4 files changed, 4 insertions(+), 19 deletions(-)

diff --git a/src/Orchard.Web/Modules/Orchard.Autoroute/Handlers/AutoroutePartHandler.cs b/src/Orchard.Web/Modules/Orchard.Autoroute/Handlers/AutoroutePartHandler.cs
index 7aef62750..e7a65940c 100644
--- a/src/Orchard.Web/Modules/Orchard.Autoroute/Handlers/AutoroutePartHandler.cs
+++ b/src/Orchard.Web/Modules/Orchard.Autoroute/Handlers/AutoroutePartHandler.cs
@@ -35,9 +35,7 @@ namespace Orchard.Autoroute.Handlers {
                     PublishAlias(part);
                 }
             });
-
-            // OnVersioned<AutoroutePart>((ctx, part1, part2) => CreateAlias(part1));
-
+            
             OnPublished<AutoroutePart>((ctx, part) => PublishAlias(part));
 
             // Remove alias if removed or unpublished
diff --git a/src/Orchard.Web/Modules/Orchard.Autoroute/Orchard.Autoroute.csproj b/src/Orchard.Web/Modules/Orchard.Autoroute/Orchard.Autoroute.csproj
index 1d2fdc543..dc9dadb66 100644
--- a/src/Orchard.Web/Modules/Orchard.Autoroute/Orchard.Autoroute.csproj
+++ b/src/Orchard.Web/Modules/Orchard.Autoroute/Orchard.Autoroute.csproj
@@ -126,9 +126,7 @@
     <Compile Include="Settings\AutorouteSettings.cs" />
     <Compile Include="ViewModels\AutoroutePartEditViewModel.cs" />
   </ItemGroup>
-  <ItemGroup>
-    <Folder Include="Controllers\" />
-  </ItemGroup>
+  <ItemGroup />
   <ItemGroup>
     <Content Include="Placement.info">
       <SubType>Designer</SubType>
diff --git a/src/Orchard.Web/Modules/Orchard.Autoroute/Services/AutorouteService.cs b/src/Orchard.Web/Modules/Orchard.Autoroute/Services/AutorouteService.cs
index 20a24a5e1..4c654eece 100644
--- a/src/Orchard.Web/Modules/Orchard.Autoroute/Services/AutorouteService.cs
+++ b/src/Orchard.Web/Modules/Orchard.Autoroute/Services/AutorouteService.cs
@@ -157,16 +157,6 @@ namespace Orchard.Autoroute.Services {
             return true;
         }
 
-        //private bool IsHomePage(IContent content) {
-        //    var homePageRoute = _aliasService.Get("");
-        //    var homePageId = homePageRoute.ContainsKey("id") ? XmlHelper.Parse<int>((string)homePageRoute["id"]) : default(int?);
-        //    return content.Id == homePageId;
-        //}
-
-        //private int GetHomePageAliasRecordId() {
-        //    return _aliasStorage.List(x => x.Path == "").First().Item5;
-        //}
-
         private SettingsDictionary GetTypePartSettings(string contentType) {
             var contentDefinition = _contentDefinitionManager.GetTypeDefinition(contentType);
 
diff --git a/src/Orchard.Web/Modules/Orchard.Autoroute/Services/PathResolutionService.cs b/src/Orchard.Web/Modules/Orchard.Autoroute/Services/PathResolutionService.cs
index afdf7e61b..91d33dabd 100644
--- a/src/Orchard.Web/Modules/Orchard.Autoroute/Services/PathResolutionService.cs
+++ b/src/Orchard.Web/Modules/Orchard.Autoroute/Services/PathResolutionService.cs
@@ -6,7 +6,7 @@ using Orchard.Data;
 namespace Orchard.Autoroute.Services {
     public class PathResolutionService : IPathResolutionService {
         private readonly IContentManager _contentManager;
-        IRepository<AutoroutePartRecord> _autorouteRepository;
+        private readonly IRepository<AutoroutePartRecord> _autorouteRepository;
 
         public PathResolutionService(
             IRepository<AutoroutePartRecord> autorouteRepository,
@@ -17,8 +17,7 @@ namespace Orchard.Autoroute.Services {
 
         public AutoroutePart GetPath(string path) {
             var autorouteRecord = _autorouteRepository.Table
-                .Where(part => part.DisplayAlias == path && part.ContentItemVersionRecord.Published)
-                .FirstOrDefault();
+                .FirstOrDefault(part => part.DisplayAlias == path && part.ContentItemVersionRecord.Published);
 
             if (autorouteRecord == null) {
                 return null;