From 12d2a947181fe74db86be39bfa4cb39dd7d955a8 Mon Sep 17 00:00:00 2001
From: Nathan Heskew <nathan.heskew@microsoft.com>
Date: Tue, 13 Jul 2010 22:27:01 -0700
Subject: [PATCH] Using Path on IsRoutable directly in the driver & handler

--HG--
branch : dev
---
 src/Orchard.Web/Core/Routable/Drivers/RoutableDriver.cs   | 6 +++---
 src/Orchard.Web/Core/Routable/Handlers/RoutableHandler.cs | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/Orchard.Web/Core/Routable/Drivers/RoutableDriver.cs b/src/Orchard.Web/Core/Routable/Drivers/RoutableDriver.cs
index 56978fcca..fbbefb304 100644
--- a/src/Orchard.Web/Core/Routable/Drivers/RoutableDriver.cs
+++ b/src/Orchard.Web/Core/Routable/Drivers/RoutableDriver.cs
@@ -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)) {
diff --git a/src/Orchard.Web/Core/Routable/Handlers/RoutableHandler.cs b/src/Orchard.Web/Core/Routable/Handlers/RoutableHandler.cs
index 91d7cba57..3c475aa04 100644
--- a/src/Orchard.Web/Core/Routable/Handlers/RoutableHandler.cs
+++ b/src/Orchard.Web/Core/Routable/Handlers/RoutableHandler.cs
@@ -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}
                 };
             }
         }