From 42e2eb630ea471ac4cbb7a9dd95af68c1529f33c Mon Sep 17 00:00:00 2001 From: Sipke Schoorstra Date: Sun, 21 Jul 2013 02:03:40 +0200 Subject: [PATCH] #19924: Moving FormValueRequiredAttribute to Orchard.Mvc, removing duplicate class declarations and updating usages. Work Item: 19924 --HG-- branch : 1.x --- .../Contents/Controllers/AdminController.cs | 14 +------------- .../Controllers/AdminController.cs | 1 + .../Controllers/AdminController.cs | 3 ++- .../Controllers/BlogAdminController.cs | 1 + .../Controllers/BlogPostAdminController.cs | 14 +------------- .../Controllers/AdminController.cs | 14 +------------- .../Controllers/AdminController.cs | 1 + .../Controllers/AdminController.cs | 3 ++- .../Controllers/ItemController.cs | 14 +------------- .../Controllers/AdminController.cs | 1 + .../Controllers/AdminController.cs | 1 + .../Controllers/AdminController.cs | 1 + .../Controllers/FolderController.cs | 1 + .../Controllers/AdminController.cs | 1 + .../Controllers/AdminController.cs | 1 + .../Controllers/AdminController.cs | 1 + .../Controllers/AdminController.cs | 1 + .../Orchard.Tags/Controllers/AdminController.cs | 14 +------------- .../Controllers/AdminController.cs | 14 +------------- .../Controllers/AdminController.cs | 1 + .../Controllers/AdminController.cs | 1 + .../Controllers/AdminController.cs | 1 + src/Orchard/Mvc/FormValueRequiredAttribute.cs | 17 +++++++++++++++++ src/Orchard/Orchard.Framework.csproj | 1 + 24 files changed, 42 insertions(+), 80 deletions(-) create mode 100644 src/Orchard/Mvc/FormValueRequiredAttribute.cs diff --git a/src/Orchard.Web/Core/Contents/Controllers/AdminController.cs b/src/Orchard.Web/Core/Contents/Controllers/AdminController.cs index eb67d5405..d920851bd 100644 --- a/src/Orchard.Web/Core/Contents/Controllers/AdminController.cs +++ b/src/Orchard.Web/Core/Contents/Controllers/AdminController.cs @@ -16,6 +16,7 @@ using Orchard.Data; using Orchard.DisplayManagement; using Orchard.Localization; using Orchard.Logging; +using Orchard.Mvc; using Orchard.Mvc.Extensions; using Orchard.Mvc.Html; using Orchard.UI.Navigation; @@ -409,17 +410,4 @@ namespace Orchard.Core.Contents.Controllers { ModelState.AddModelError(key, errorMessage.ToString()); } } - - public class FormValueRequiredAttribute : ActionMethodSelectorAttribute { - private readonly string _submitButtonName; - - public FormValueRequiredAttribute(string submitButtonName) { - _submitButtonName = submitButtonName; - } - - public override bool IsValidForRequest(ControllerContext controllerContext, MethodInfo methodInfo) { - var value = controllerContext.HttpContext.Request.Form[_submitButtonName]; - return !string.IsNullOrEmpty(value); - } - } } diff --git a/src/Orchard.Web/Modules/Orchard.Alias/Controllers/AdminController.cs b/src/Orchard.Web/Modules/Orchard.Alias/Controllers/AdminController.cs index 21d1d55a6..fb0920d3a 100644 --- a/src/Orchard.Web/Modules/Orchard.Alias/Controllers/AdminController.cs +++ b/src/Orchard.Web/Modules/Orchard.Alias/Controllers/AdminController.cs @@ -9,6 +9,7 @@ using Orchard.Core.Contents.Controllers; using Orchard.Environment.Extensions; using Orchard.Localization; using Orchard.Logging; +using Orchard.Mvc; using Orchard.Mvc.Extensions; using Orchard.Security; using Orchard.UI.Navigation; diff --git a/src/Orchard.Web/Modules/Orchard.AntiSpam/Controllers/AdminController.cs b/src/Orchard.Web/Modules/Orchard.AntiSpam/Controllers/AdminController.cs index 6c67b5bfc..36863d2fb 100644 --- a/src/Orchard.Web/Modules/Orchard.AntiSpam/Controllers/AdminController.cs +++ b/src/Orchard.Web/Modules/Orchard.AntiSpam/Controllers/AdminController.cs @@ -10,6 +10,7 @@ using Orchard.ContentManagement; using Orchard.Core.Common.Models; using Orchard.DisplayManagement; using Orchard.Localization; +using Orchard.Mvc; using Orchard.Settings; using Orchard.UI.Navigation; using Orchard.Mvc.Extensions; @@ -95,7 +96,7 @@ namespace Orchard.AntiSpam.Controllers { } [HttpPost] - [Core.Contents.Controllers.FormValueRequired("submit.BulkEdit")] + [FormValueRequired("submit.BulkEdit")] public ActionResult Index(SpamIndexOptions options, IEnumerable itemIds) { if (!Services.Authorizer.Authorize(Permissions.ManageAntiSpam, T("Not authorized to manage spam"))) return new HttpUnauthorizedResult(); diff --git a/src/Orchard.Web/Modules/Orchard.Blogs/Controllers/BlogAdminController.cs b/src/Orchard.Web/Modules/Orchard.Blogs/Controllers/BlogAdminController.cs index a47cfeff7..b943cdcc6 100644 --- a/src/Orchard.Web/Modules/Orchard.Blogs/Controllers/BlogAdminController.cs +++ b/src/Orchard.Web/Modules/Orchard.Blogs/Controllers/BlogAdminController.cs @@ -8,6 +8,7 @@ using Orchard.ContentManagement; using Orchard.Data; using Orchard.DisplayManagement; using Orchard.Localization; +using Orchard.Mvc; using Orchard.UI.Admin; using Orchard.UI.Navigation; using Orchard.UI.Notify; diff --git a/src/Orchard.Web/Modules/Orchard.Blogs/Controllers/BlogPostAdminController.cs b/src/Orchard.Web/Modules/Orchard.Blogs/Controllers/BlogPostAdminController.cs index e47cbec78..3372d2b29 100644 --- a/src/Orchard.Web/Modules/Orchard.Blogs/Controllers/BlogPostAdminController.cs +++ b/src/Orchard.Web/Modules/Orchard.Blogs/Controllers/BlogPostAdminController.cs @@ -8,6 +8,7 @@ using Orchard.ContentManagement; using Orchard.ContentManagement.Aspects; using Orchard.Core.Contents.Settings; using Orchard.Localization; +using Orchard.Mvc; using Orchard.Mvc.AntiForgery; using Orchard.Mvc.Extensions; using Orchard.UI.Admin; @@ -279,17 +280,4 @@ namespace Orchard.Blogs.Controllers { ModelState.AddModelError(key, errorMessage.ToString()); } } - - public class FormValueRequiredAttribute : ActionMethodSelectorAttribute { - private readonly string _submitButtonName; - - public FormValueRequiredAttribute(string submitButtonName) { - _submitButtonName = submitButtonName; - } - - public override bool IsValidForRequest(ControllerContext controllerContext, MethodInfo methodInfo) { - var value = controllerContext.HttpContext.Request.Form[_submitButtonName]; - return !string.IsNullOrEmpty(value); - } - } } \ No newline at end of file diff --git a/src/Orchard.Web/Modules/Orchard.Comments/Controllers/AdminController.cs b/src/Orchard.Web/Modules/Orchard.Comments/Controllers/AdminController.cs index b631406a2..65dc1f4da 100644 --- a/src/Orchard.Web/Modules/Orchard.Comments/Controllers/AdminController.cs +++ b/src/Orchard.Web/Modules/Orchard.Comments/Controllers/AdminController.cs @@ -8,6 +8,7 @@ using Orchard.ContentManagement; using Orchard.DisplayManagement; using Orchard.Localization; using Orchard.Logging; +using Orchard.Mvc; using Orchard.Mvc.Extensions; using Orchard.UI.Navigation; using Orchard.UI.Notify; @@ -297,19 +298,6 @@ namespace Orchard.Comments.Controllers { }; } - public class FormValueRequiredAttribute : ActionMethodSelectorAttribute { - private readonly string _submitButtonName; - - public FormValueRequiredAttribute(string submitButtonName) { - _submitButtonName = submitButtonName; - } - - public override bool IsValidForRequest(ControllerContext controllerContext, MethodInfo methodInfo) { - var value = controllerContext.HttpContext.Request.Form[_submitButtonName]; - return !string.IsNullOrEmpty(value); - } - } - bool IUpdateModel.TryUpdateModel(TModel model, string prefix, string[] includeProperties, string[] excludeProperties) { return TryUpdateModel(model, prefix, includeProperties, excludeProperties); } diff --git a/src/Orchard.Web/Modules/Orchard.ContentTypes/Controllers/AdminController.cs b/src/Orchard.Web/Modules/Orchard.ContentTypes/Controllers/AdminController.cs index d7ac79fb0..9c06e2c70 100644 --- a/src/Orchard.Web/Modules/Orchard.ContentTypes/Controllers/AdminController.cs +++ b/src/Orchard.Web/Modules/Orchard.ContentTypes/Controllers/AdminController.cs @@ -14,6 +14,7 @@ using Orchard.Core.Contents.Settings; using Orchard.Environment.Configuration; using Orchard.Localization; using Orchard.Logging; +using Orchard.Mvc; using Orchard.UI; using Orchard.UI.Notify; using Orchard.Utility.Extensions; diff --git a/src/Orchard.Web/Modules/Orchard.CustomForms/Controllers/AdminController.cs b/src/Orchard.Web/Modules/Orchard.CustomForms/Controllers/AdminController.cs index 920655abe..da8354c1f 100644 --- a/src/Orchard.Web/Modules/Orchard.CustomForms/Controllers/AdminController.cs +++ b/src/Orchard.Web/Modules/Orchard.CustomForms/Controllers/AdminController.cs @@ -9,6 +9,7 @@ using Orchard.CustomForms.Models; using Orchard.CustomForms.ViewModels; using Orchard.DisplayManagement; using Orchard.Localization; +using Orchard.Mvc; using Orchard.Security; using System; using Orchard.Settings; @@ -80,7 +81,7 @@ namespace Orchard.CustomForms.Controllers { } [HttpPost] - [Core.Contents.Controllers.FormValueRequired("submit.BulkEdit")] + [FormValueRequired("submit.BulkEdit")] public ActionResult Index(FormCollection input) { if (!Services.Authorizer.Authorize(Permissions.ManageForms, T("Not authorized to manage customForm"))) return new HttpUnauthorizedResult(); diff --git a/src/Orchard.Web/Modules/Orchard.CustomForms/Controllers/ItemController.cs b/src/Orchard.Web/Modules/Orchard.CustomForms/Controllers/ItemController.cs index 9f6ae088e..d11e6de09 100644 --- a/src/Orchard.Web/Modules/Orchard.CustomForms/Controllers/ItemController.cs +++ b/src/Orchard.Web/Modules/Orchard.CustomForms/Controllers/ItemController.cs @@ -12,6 +12,7 @@ using Orchard.Data; using Orchard.DisplayManagement; using Orchard.Localization; using Orchard.Logging; +using Orchard.Mvc; using Orchard.Mvc.Extensions; using Orchard.Themes; using Orchard.Tokens; @@ -181,17 +182,4 @@ namespace Orchard.CustomForms.Controllers { ModelState.AddModelError(key, errorMessage.ToString()); } } - - public class FormValueRequiredAttribute : ActionMethodSelectorAttribute { - private readonly string _submitButtonName; - - public FormValueRequiredAttribute(string submitButtonName) { - _submitButtonName = submitButtonName; - } - - public override bool IsValidForRequest(ControllerContext controllerContext, MethodInfo methodInfo) { - var value = controllerContext.HttpContext.Request.Form[_submitButtonName]; - return !string.IsNullOrEmpty(value); - } - } } diff --git a/src/Orchard.Web/Modules/Orchard.Lists/Controllers/AdminController.cs b/src/Orchard.Web/Modules/Orchard.Lists/Controllers/AdminController.cs index ab9f3c173..e2865900c 100644 --- a/src/Orchard.Web/Modules/Orchard.Lists/Controllers/AdminController.cs +++ b/src/Orchard.Web/Modules/Orchard.Lists/Controllers/AdminController.cs @@ -14,6 +14,7 @@ using Orchard.DisplayManagement; using Orchard.Lists.ViewModels; using Orchard.Localization; using Orchard.Logging; +using Orchard.Mvc; using Orchard.Mvc.Extensions; using Orchard.Settings; using Orchard.UI.Navigation; diff --git a/src/Orchard.Web/Modules/Orchard.Localization/Controllers/AdminController.cs b/src/Orchard.Web/Modules/Orchard.Localization/Controllers/AdminController.cs index 34ffc6b14..35261896d 100644 --- a/src/Orchard.Web/Modules/Orchard.Localization/Controllers/AdminController.cs +++ b/src/Orchard.Web/Modules/Orchard.Localization/Controllers/AdminController.cs @@ -9,6 +9,7 @@ using Orchard.DisplayManagement; using Orchard.Localization.Models; using Orchard.Localization.Services; using Orchard.Localization.ViewModels; +using Orchard.Mvc; using Orchard.UI.Notify; namespace Orchard.Localization.Controllers { diff --git a/src/Orchard.Web/Modules/Orchard.Media/Controllers/AdminController.cs b/src/Orchard.Web/Modules/Orchard.Media/Controllers/AdminController.cs index 72020ed37..33abae042 100644 --- a/src/Orchard.Web/Modules/Orchard.Media/Controllers/AdminController.cs +++ b/src/Orchard.Web/Modules/Orchard.Media/Controllers/AdminController.cs @@ -9,6 +9,7 @@ using Orchard.Logging; using Orchard.Media.Models; using Orchard.Media.Services; using Orchard.Media.ViewModels; +using Orchard.Mvc; using Orchard.UI.Notify; namespace Orchard.Media.Controllers { diff --git a/src/Orchard.Web/Modules/Orchard.MediaLibrary/Controllers/FolderController.cs b/src/Orchard.Web/Modules/Orchard.MediaLibrary/Controllers/FolderController.cs index 63697e4d7..d257cf167 100644 --- a/src/Orchard.Web/Modules/Orchard.MediaLibrary/Controllers/FolderController.cs +++ b/src/Orchard.Web/Modules/Orchard.MediaLibrary/Controllers/FolderController.cs @@ -8,6 +8,7 @@ using Orchard.Logging; using Orchard.MediaLibrary.Models; using Orchard.MediaLibrary.Services; using Orchard.MediaLibrary.ViewModels; +using Orchard.Mvc; using Orchard.UI.Admin; using Orchard.UI.Notify; diff --git a/src/Orchard.Web/Modules/Orchard.MediaProcessing/Controllers/AdminController.cs b/src/Orchard.Web/Modules/Orchard.MediaProcessing/Controllers/AdminController.cs index f06a4cb2d..e49a20e17 100644 --- a/src/Orchard.Web/Modules/Orchard.MediaProcessing/Controllers/AdminController.cs +++ b/src/Orchard.Web/Modules/Orchard.MediaProcessing/Controllers/AdminController.cs @@ -12,6 +12,7 @@ using Orchard.MediaProcessing.Descriptors.Filter; using Orchard.MediaProcessing.Models; using Orchard.MediaProcessing.Services; using Orchard.MediaProcessing.ViewModels; +using Orchard.Mvc; using Orchard.Security; using Orchard.Settings; using Orchard.UI.Navigation; diff --git a/src/Orchard.Web/Modules/Orchard.Projections/Controllers/AdminController.cs b/src/Orchard.Web/Modules/Orchard.Projections/Controllers/AdminController.cs index e2fb5dede..ea467ea8b 100644 --- a/src/Orchard.Web/Modules/Orchard.Projections/Controllers/AdminController.cs +++ b/src/Orchard.Web/Modules/Orchard.Projections/Controllers/AdminController.cs @@ -4,6 +4,7 @@ using System.Web.Mvc; using System.Web.Routing; using Orchard.Core.Title.Models; using Orchard.Forms.Services; +using Orchard.Mvc; using Orchard.Projections.Descriptors.Filter; using Orchard.Projections.Descriptors.Layout; using Orchard.Projections.Descriptors.SortCriterion; diff --git a/src/Orchard.Web/Modules/Orchard.Roles/Controllers/AdminController.cs b/src/Orchard.Web/Modules/Orchard.Roles/Controllers/AdminController.cs index 49e087ba1..04df3ac9e 100644 --- a/src/Orchard.Web/Modules/Orchard.Roles/Controllers/AdminController.cs +++ b/src/Orchard.Web/Modules/Orchard.Roles/Controllers/AdminController.cs @@ -5,6 +5,7 @@ using System.Web.Mvc; using Orchard.Core.Contents.Controllers; using Orchard.Localization; using Orchard.Logging; +using Orchard.Mvc; using Orchard.Mvc.Extensions; using Orchard.Roles.Models; using Orchard.Roles.Services; diff --git a/src/Orchard.Web/Modules/Orchard.Rules/Controllers/AdminController.cs b/src/Orchard.Web/Modules/Orchard.Rules/Controllers/AdminController.cs index 358aa426f..426a6e888 100644 --- a/src/Orchard.Web/Modules/Orchard.Rules/Controllers/AdminController.cs +++ b/src/Orchard.Web/Modules/Orchard.Rules/Controllers/AdminController.cs @@ -3,6 +3,7 @@ using System.Linq; using System.Web.Mvc; using System.Web.Routing; using Orchard.Forms.Services; +using Orchard.Mvc; using Orchard.Rules.Models; using Orchard.Rules.Services; using Orchard.Rules.ViewModels; diff --git a/src/Orchard.Web/Modules/Orchard.Tags/Controllers/AdminController.cs b/src/Orchard.Web/Modules/Orchard.Tags/Controllers/AdminController.cs index 2e1026aaa..666e362c2 100644 --- a/src/Orchard.Web/Modules/Orchard.Tags/Controllers/AdminController.cs +++ b/src/Orchard.Web/Modules/Orchard.Tags/Controllers/AdminController.cs @@ -5,6 +5,7 @@ using System.Reflection; using System.Web.Mvc; using Orchard.Localization; using Orchard.ContentManagement; +using Orchard.Mvc; using Orchard.Mvc.Extensions; using Orchard.Tags.Models; using Orchard.Tags.ViewModels; @@ -146,18 +147,5 @@ namespace Orchard.Tags.Controllers { IsChecked = false, }; } - - public class FormValueRequiredAttribute : ActionMethodSelectorAttribute { - private readonly string _submitButtonName; - - public FormValueRequiredAttribute(string submitButtonName) { - _submitButtonName = submitButtonName; - } - - public override bool IsValidForRequest(ControllerContext controllerContext, MethodInfo methodInfo) { - var value = controllerContext.HttpContext.Request.Form[_submitButtonName]; - return !string.IsNullOrEmpty(value); - } - } } } diff --git a/src/Orchard.Web/Modules/Orchard.Themes/Controllers/AdminController.cs b/src/Orchard.Web/Modules/Orchard.Themes/Controllers/AdminController.cs index a281d76af..fc32c8ce9 100644 --- a/src/Orchard.Web/Modules/Orchard.Themes/Controllers/AdminController.cs +++ b/src/Orchard.Web/Modules/Orchard.Themes/Controllers/AdminController.cs @@ -10,6 +10,7 @@ using Orchard.Environment.Extensions.Models; using Orchard.Environment.Features; using Orchard.Localization; using Orchard.Logging; +using Orchard.Mvc; using Orchard.Mvc.Extensions; using Orchard.Reports.Services; using Orchard.Security; @@ -239,19 +240,6 @@ namespace Orchard.Themes.Controllers { return RedirectToAction("Index"); } - class FormValueRequiredAttribute : ActionMethodSelectorAttribute { - private readonly string _submitButtonName; - - public FormValueRequiredAttribute(string submitButtonName) { - _submitButtonName = submitButtonName; - } - - public override bool IsValidForRequest(ControllerContext controllerContext, MethodInfo methodInfo) { - var value = controllerContext.HttpContext.Request.Form[_submitButtonName]; - return !string.IsNullOrEmpty(value); - } - } - [AttributeUsage(AttributeTargets.Method, AllowMultiple = true)] class FormValueAbsentAttribute : ActionMethodSelectorAttribute { private readonly string _submitButtonName; diff --git a/src/Orchard.Web/Modules/Orchard.Users/Controllers/AdminController.cs b/src/Orchard.Web/Modules/Orchard.Users/Controllers/AdminController.cs index f372034b1..ac2c8969a 100644 --- a/src/Orchard.Web/Modules/Orchard.Users/Controllers/AdminController.cs +++ b/src/Orchard.Web/Modules/Orchard.Users/Controllers/AdminController.cs @@ -8,6 +8,7 @@ using Orchard.Core.Contents.Controllers; using Orchard.Core.Settings.Models; using Orchard.DisplayManagement; using Orchard.Localization; +using Orchard.Mvc; using Orchard.Security; using Orchard.UI.Notify; using Orchard.Users.Events; diff --git a/src/Orchard.Web/Modules/Orchard.Warmup/Controllers/AdminController.cs b/src/Orchard.Web/Modules/Orchard.Warmup/Controllers/AdminController.cs index e350f92bb..768ebb6af 100644 --- a/src/Orchard.Web/Modules/Orchard.Warmup/Controllers/AdminController.cs +++ b/src/Orchard.Web/Modules/Orchard.Warmup/Controllers/AdminController.cs @@ -5,6 +5,7 @@ using System.Web.Mvc; using Orchard.ContentManagement; using Orchard.Core.Contents.Controllers; using Orchard.Localization; +using Orchard.Mvc; using Orchard.Security; using Orchard.Warmup.Models; using Orchard.UI.Notify; diff --git a/src/Orchard.Web/Modules/Orchard.Widgets/Controllers/AdminController.cs b/src/Orchard.Web/Modules/Orchard.Widgets/Controllers/AdminController.cs index b3edfadad..85df52f8b 100644 --- a/src/Orchard.Web/Modules/Orchard.Widgets/Controllers/AdminController.cs +++ b/src/Orchard.Web/Modules/Orchard.Widgets/Controllers/AdminController.cs @@ -10,6 +10,7 @@ using Orchard.Environment.Extensions.Models; using Orchard.FileSystems.VirtualPath; using Orchard.Localization; using Orchard.Logging; +using Orchard.Mvc; using Orchard.Mvc.Extensions; using Orchard.Themes.Services; using Orchard.UI.Admin; diff --git a/src/Orchard/Mvc/FormValueRequiredAttribute.cs b/src/Orchard/Mvc/FormValueRequiredAttribute.cs new file mode 100644 index 000000000..0e2d2d3ef --- /dev/null +++ b/src/Orchard/Mvc/FormValueRequiredAttribute.cs @@ -0,0 +1,17 @@ +using System.Reflection; +using System.Web.Mvc; + +namespace Orchard.Mvc { + public class FormValueRequiredAttribute : ActionMethodSelectorAttribute { + private readonly string _submitButtonName; + + public FormValueRequiredAttribute(string submitButtonName) { + _submitButtonName = submitButtonName; + } + + public override bool IsValidForRequest(ControllerContext controllerContext, MethodInfo methodInfo) { + var value = controllerContext.HttpContext.Request.Form[_submitButtonName]; + return !string.IsNullOrEmpty(value); + } + } +} \ No newline at end of file diff --git a/src/Orchard/Orchard.Framework.csproj b/src/Orchard/Orchard.Framework.csproj index 5a041610c..6c04b2476 100644 --- a/src/Orchard/Orchard.Framework.csproj +++ b/src/Orchard/Orchard.Framework.csproj @@ -271,6 +271,7 @@ +