From 661ac0016f24c4b37093d6a127cfc9c708dc0ec7 Mon Sep 17 00:00:00 2001 From: Sebastien Ros Date: Mon, 29 Apr 2013 15:45:35 -0700 Subject: [PATCH] #19312: Hiding reCaptcha in admin Work Item: 19312 --HG-- branch : 1.x --- .../Drivers/ReCaptchaPartDriver.cs | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/src/Orchard.Web/Modules/Orchard.AntiSpam/Drivers/ReCaptchaPartDriver.cs b/src/Orchard.Web/Modules/Orchard.AntiSpam/Drivers/ReCaptchaPartDriver.cs index 29ed13d15..94b2c1f82 100644 --- a/src/Orchard.Web/Modules/Orchard.AntiSpam/Drivers/ReCaptchaPartDriver.cs +++ b/src/Orchard.Web/Modules/Orchard.AntiSpam/Drivers/ReCaptchaPartDriver.cs @@ -9,6 +9,7 @@ using Orchard.AntiSpam.ViewModels; using Orchard.ContentManagement; using Orchard.ContentManagement.Drivers; using Orchard.Localization; +using Orchard.UI.Admin; namespace Orchard.AntiSpam.Drivers { public class ReCaptchaPartDriver : ContentPartDriver { @@ -24,16 +25,22 @@ namespace Orchard.AntiSpam.Drivers { public Localizer T { get; set; } protected override DriverResult Editor(ReCaptchaPart part, dynamic shapeHelper) { + var workContext = _workContextAccessor.GetContext(); + + // don't display the part in the admin + if (AdminFilter.IsApplied(workContext.HttpContext.Request.RequestContext)) { + return null; + } + return ContentShape("Parts_ReCaptcha_Fields", () => { - var workContext = _workContextAccessor.GetContext(); var settings = workContext.CurrentSite.As(); - if(settings.TrustAuthenticatedUsers && workContext.CurrentUser != null) { + if (settings.TrustAuthenticatedUsers && workContext.CurrentUser != null) { return null; } var viewModel = new ReCaptchaPartEditViewModel { - PublicKey = settings.PublicKey + PublicKey = settings.PublicKey }; return shapeHelper.EditorTemplate(TemplateName: "Parts.ReCaptcha.Fields", Model: viewModel, Prefix: Prefix); @@ -44,6 +51,11 @@ namespace Orchard.AntiSpam.Drivers { var workContext = _workContextAccessor.GetContext(); var settings = workContext.CurrentSite.As(); + // don't display the part in the admin + if (AdminFilter.IsApplied(workContext.HttpContext.Request.RequestContext)) { + return null; + } + if (settings.TrustAuthenticatedUsers && workContext.CurrentUser != null) { return null; }