lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2026-01-23 21:32:14 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

#19924: Moving FormValueRequiredAttribute to Orchard.Mvc, removing duplicate class declarations and updating usages.

Browse Source 
Work Item: 19924

--HG--
branch : 1.x
This commit is contained in:
Sipke Schoorstra
2013-07-21 02:03:40 +02:00
parent f15d521009
commit 42e2eb630e
24 changed files with 42 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/Orchard.Web/Core/Contents/Controllers/AdminController.cs
View File

@@ -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);
}
}
}

1
src/Orchard.Web/Modules/Orchard.Alias/Controllers/AdminController.cs
View File

@@ -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;

3
src/Orchard.Web/Modules/Orchard.AntiSpam/Controllers/AdminController.cs
View File

@@ -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<int> itemIds) {
if (!Services.Authorizer.Authorize(Permissions.ManageAntiSpam, T("Not authorized to manage spam")))
return new HttpUnauthorizedResult();

1
src/Orchard.Web/Modules/Orchard.Blogs/Controllers/BlogAdminController.cs
View File

@@ -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;

14
src/Orchard.Web/Modules/Orchard.Blogs/Controllers/BlogPostAdminController.cs
View File

@@ -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);
}
}
}

14
src/Orchard.Web/Modules/Orchard.Comments/Controllers/AdminController.cs
View File

@@ -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>(TModel model, string prefix, string[] includeProperties, string[] excludeProperties) {
return TryUpdateModel(model, prefix, includeProperties, excludeProperties);
}

1
src/Orchard.Web/Modules/Orchard.ContentTypes/Controllers/AdminController.cs
View File

@@ -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;

3
src/Orchard.Web/Modules/Orchard.CustomForms/Controllers/AdminController.cs
View File

@@ -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();

14
src/Orchard.Web/Modules/Orchard.CustomForms/Controllers/ItemController.cs
View File

@@ -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);
}
}
}

1
src/Orchard.Web/Modules/Orchard.Lists/Controllers/AdminController.cs
View File

@@ -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;

1
src/Orchard.Web/Modules/Orchard.Localization/Controllers/AdminController.cs
View File

@@ -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 {

1
src/Orchard.Web/Modules/Orchard.Media/Controllers/AdminController.cs
View File

@@ -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 {

1
src/Orchard.Web/Modules/Orchard.MediaLibrary/Controllers/FolderController.cs
View File

@@ -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;

1
src/Orchard.Web/Modules/Orchard.MediaProcessing/Controllers/AdminController.cs
View File

@@ -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;

1
src/Orchard.Web/Modules/Orchard.Projections/Controllers/AdminController.cs
View File

@@ -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;

1
src/Orchard.Web/Modules/Orchard.Roles/Controllers/AdminController.cs
View File

@@ -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;

1
src/Orchard.Web/Modules/Orchard.Rules/Controllers/AdminController.cs
View File

@@ -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;

14
src/Orchard.Web/Modules/Orchard.Tags/Controllers/AdminController.cs
View File

@@ -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);
}
}
}
}

14
src/Orchard.Web/Modules/Orchard.Themes/Controllers/AdminController.cs
View File

@@ -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;

1
src/Orchard.Web/Modules/Orchard.Users/Controllers/AdminController.cs
View File

@@ -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;

1
src/Orchard.Web/Modules/Orchard.Warmup/Controllers/AdminController.cs
View File

@@ -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;

1
src/Orchard.Web/Modules/Orchard.Widgets/Controllers/AdminController.cs
View File

@@ -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;

17
src/Orchard/Mvc/FormValueRequiredAttribute.cs Normal file
View File

@@ -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);
}
}
}

1
src/Orchard/Orchard.Framework.csproj
View File

@@ -271,6 +271,7 @@
<Compile Include="Mvc\DataAnnotations\LocalizedModelValidatorProvider.cs" />
<Compile Include="Mvc\DataAnnotations\LocalizedRequiredAttribute.cs" />
<Compile Include="Mvc\Extensions\RouteExtension.cs" />
<Compile Include="Mvc\FormValueRequiredAttribute.cs" />
<Compile Include="Mvc\HttpContextWorkContext.cs" />
<Compile Include="Mvc\Extensions\ControllerExtensions.cs" />
<Compile Include="Mvc\IOrchardViewPage.cs" />