From 4bae7e55d48a32863737f27ce0c8f6355cdf3dea Mon Sep 17 00:00:00 2001 From: Sebastien Ros Date: Mon, 27 Feb 2012 12:48:32 -0800 Subject: [PATCH] Adding a warning when Orchard.Fields is not enabled --HG-- branch : 1.x --- .../UpgradeTo14/Controllers/FieldController.cs | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/src/Orchard.Web/Modules/UpgradeTo14/Controllers/FieldController.cs b/src/Orchard.Web/Modules/UpgradeTo14/Controllers/FieldController.cs index 274eaa046..7171398c3 100644 --- a/src/Orchard.Web/Modules/UpgradeTo14/Controllers/FieldController.cs +++ b/src/Orchard.Web/Modules/UpgradeTo14/Controllers/FieldController.cs @@ -5,6 +5,7 @@ using Orchard; using Orchard.ContentManagement; using Orchard.ContentManagement.MetaData; using Orchard.Data; +using Orchard.Environment.Features; using Orchard.Localization; using Orchard.Security; using Orchard.UI.Admin; @@ -16,15 +17,15 @@ namespace UpgradeTo14.Controllers { public class FieldController : Controller { private readonly IContentDefinitionManager _contentDefinitionManager; private readonly IOrchardServices _orchardServices; - private readonly ISessionFactoryHolder _sessionFactoryHolder; + private readonly IFeatureManager _featureManager; public FieldController( IContentDefinitionManager contentDefinitionManager, IOrchardServices orchardServices, - ISessionFactoryHolder sessionFactoryHolder) { + IFeatureManager featureManager) { _contentDefinitionManager = contentDefinitionManager; _orchardServices = orchardServices; - _sessionFactoryHolder = sessionFactoryHolder; + _featureManager = featureManager; } public Localizer T { get; set; } @@ -42,6 +43,10 @@ namespace UpgradeTo14.Controllers { _orchardServices.Notifier.Warning(T("There are no content types with custom fields")); } + if(!_featureManager.GetEnabledFeatures().Any(x => x.Id == "Orchard.Fields")) { + _orchardServices.Notifier.Warning(T("You need to enable Orchard.Fields in order to migrate current fields. Then you can safely remove Contrib.DateTimeField and Contrib.MediaPickerField.")); + } + return View(viewModel); }