lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2025-09-23 12:53:33 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Correcting some namespaces preparing for admin story

Browse Source 
Orchard.Mvc.Filters contains base implementations, not specific functionality
Orchard.Mvc.AntiForgery and Orchard.UI.Admin contain specific functionality

--HG--
branch : dev
This commit is contained in:
Louis DeJardin
2010-02-25 23:45:37 -08:00
parent 691908fb48
commit 09be861aaf
6 changed files with 10 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Orchard.Web/Core/Navigation/Controllers/AdminController.cs
View File

@@ -8,7 +8,7 @@ using Orchard.Core.Navigation.Models;
using Orchard.Core.Navigation.Services; using Orchard.Core.Navigation.Services;
using Orchard.Core.Navigation.ViewModels; using Orchard.Core.Navigation.ViewModels;
using Orchard.Localization; using Orchard.Localization;
using Orchard.Mvc.Attributes; using Orchard.Mvc.AntiForgery;
using Orchard.UI.Navigation; using Orchard.UI.Navigation;
using Orchard.Utility; using Orchard.Utility;
using MenuItem=Orchard.Core.Navigation.Models.MenuItem; using MenuItem=Orchard.Core.Navigation.Models.MenuItem;

2
src/Orchard.Web/Modules/Orchard.Blogs/Controllers/BlogPostDriver.cs
View File

@@ -15,7 +15,6 @@ using Orchard.UI.Notify;
namespace Orchard.Blogs.Controllers { namespace Orchard.Blogs.Controllers {
[UsedImplicitly] [UsedImplicitly]
public class BlogPostDriver : ContentItemDriver<BlogPost> { public class BlogPostDriver : ContentItemDriver<BlogPost> {
private readonly IBlogService _blogService;
private readonly IBlogPostService _blogPostService; private readonly IBlogPostService _blogPostService;
private readonly IRoutableService _routableService; private readonly IRoutableService _routableService;
private readonly IOrchardServices _orchardServices; private readonly IOrchardServices _orchardServices;
@@ -26,7 +25,6 @@ namespace Orchard.Blogs.Controllers {
}; };
public BlogPostDriver(IBlogService blogService, IBlogPostService blogPostService, IRoutableService routableService, IOrchardServices orchardServices) { public BlogPostDriver(IBlogService blogService, IBlogPostService blogPostService, IRoutableService routableService, IOrchardServices orchardServices) {
_blogService = blogService;
_blogPostService = blogPostService; _blogPostService = blogPostService;
_routableService = routableService; _routableService = routableService;
_orchardServices = orchardServices; _orchardServices = orchardServices;

6
src/Orchard/Mvc/Filters/AntiForgeryAuthorizationFilter.cs → src/Orchard/Mvc/AntiForgery/AntiForgeryAuthorizationFilter.cs
View File

@@ -2,11 +2,11 @@ using System.Collections.Specialized;
using System.Web; using System.Web;
using System.Web.Mvc; using System.Web.Mvc;
using JetBrains.Annotations; using JetBrains.Annotations;
using Orchard.Mvc.Attributes; using Orchard.Mvc.Filters;
using Orchard.Security; using Orchard.Security;
using Orchard.Settings; using Orchard.Settings;
namespace Orchard.Mvc.Filters { namespace Orchard.Mvc.AntiForgery {
[UsedImplicitly] [UsedImplicitly]
public class AntiForgeryAuthorizationFilter : FilterProvider, IAuthorizationFilter { public class AntiForgeryAuthorizationFilter : FilterProvider, IAuthorizationFilter {
private readonly ISiteService _siteService; private readonly ISiteService _siteService;
@@ -113,4 +113,4 @@ namespace Orchard.Mvc.Filters {
#endregion #endregion
} }
} }

2
src/Orchard/Mvc/Attributes/ValidateAntiForgeryTokenOrchardAttribute.cs → src/Orchard/Mvc/AntiForgery/ValidateAntiForgeryTokenOrchardAttribute.cs
View File

@@ -1,7 +1,7 @@
using System; using System;
using System.Web.Mvc; using System.Web.Mvc;
namespace Orchard.Mvc.Attributes { namespace Orchard.Mvc.AntiForgery {
[AttributeUsage(AttributeTargets.Method)] [AttributeUsage(AttributeTargets.Method)]
public class ValidateAntiForgeryTokenOrchardAttribute : FilterAttribute { public class ValidateAntiForgeryTokenOrchardAttribute : FilterAttribute {
} }

6
src/Orchard/Orchard.csproj
View File

@@ -152,7 +152,7 @@
<Compile Include="Extensions\ExtensionFolders.cs" /> <Compile Include="Extensions\ExtensionFolders.cs" />
<Compile Include="Extensions\Loaders\AreaExtensionLoader.cs" /> <Compile Include="Extensions\Loaders\AreaExtensionLoader.cs" />
<Compile Include="Extensions\UriExtensions.cs" /> <Compile Include="Extensions\UriExtensions.cs" />
<Compile Include="Mvc\Attributes\ValidateAntiForgeryTokenOrchardAttribute.cs" /> <Compile Include="Mvc\AntiForgery\ValidateAntiForgeryTokenOrchardAttribute.cs" />
<Compile Include="OrchardException.cs" /> <Compile Include="OrchardException.cs" />
<Compile Include="Security\IAuthorizationServiceEvents.cs" /> <Compile Include="Security\IAuthorizationServiceEvents.cs" />
<Compile Include="Security\StandardPermissions.cs" /> <Compile Include="Security\StandardPermissions.cs" />
@@ -225,8 +225,8 @@
<Compile Include="Extensions\ExtensionDescriptor.cs" /> <Compile Include="Extensions\ExtensionDescriptor.cs" />
<Compile Include="Extensions\ExtensionEntry.cs" /> <Compile Include="Extensions\ExtensionEntry.cs" />
<Compile Include="IOrchardServices.cs" /> <Compile Include="IOrchardServices.cs" />
<Compile Include="Mvc\Filters\AdminFilter.cs" /> <Compile Include="UI\Admin\AdminFilter.cs" />
<Compile Include="Mvc\Filters\AntiForgeryAuthorizationFilter.cs" /> <Compile Include="Mvc\AntiForgery\AntiForgeryAuthorizationFilter.cs" />
<Compile Include="Mvc\Html\FileRegistrationContext.cs" /> <Compile Include="Mvc\Html\FileRegistrationContext.cs" />
<Compile Include="Mvc\Html\MvcFormAntiForgeryPost.cs" /> <Compile Include="Mvc\Html\MvcFormAntiForgeryPost.cs" />
<Compile Include="Mvc\Html\SiteServiceExtensions.cs" /> <Compile Include="Mvc\Html\SiteServiceExtensions.cs" />

3
src/Orchard/Mvc/Filters/AdminFilter.cs → src/Orchard/UI/Admin/AdminFilter.cs
View File

@@ -1,10 +1,11 @@
using System.Globalization; using System.Globalization;
using System.IO; using System.IO;
using System.Web.Mvc; using System.Web.Mvc;
using Orchard.Mvc.Filters;
using Orchard.Security; using Orchard.Security;
using Orchard.Settings; using Orchard.Settings;
namespace Orchard.Mvc.Filters { namespace Orchard.UI.Admin {
public class AdminFilter : FilterProvider, IActionFilter public class AdminFilter : FilterProvider, IActionFilter
{ {
private readonly IAuthorizer _authorizer; private readonly IAuthorizer _authorizer;