diff --git a/src/Orchard.Web/Modules/Upgrade/Controllers/MediaController.cs b/src/Orchard.Web/Modules/Upgrade/Controllers/MediaController.cs index c7092ffd5..a3a1b60d9 100644 --- a/src/Orchard.Web/Modules/Upgrade/Controllers/MediaController.cs +++ b/src/Orchard.Web/Modules/Upgrade/Controllers/MediaController.cs @@ -34,9 +34,13 @@ namespace Upgrade.Controllers { public ILogger Logger { get; set; } public ActionResult Index() { - if(_featureManager.GetEnabledFeatures().All(x => x.Id != "Orchard.MediaLibrary")) { + ViewBag.CanMigrate = false; + if (_featureManager.GetEnabledFeatures().All(x => x.Id != "Orchard.MediaLibrary")) { _orchardServices.Notifier.Warning(T("You need to enable Orchard.MediaLibrary in order to convert current media files to the Media Library.")); } + else { + ViewBag.CanMigrate = true; + } return View(); } diff --git a/src/Orchard.Web/Modules/Upgrade/Controllers/TaxonomyController.cs b/src/Orchard.Web/Modules/Upgrade/Controllers/TaxonomyController.cs index 2019faf6e..2bece1e5a 100644 --- a/src/Orchard.Web/Modules/Upgrade/Controllers/TaxonomyController.cs +++ b/src/Orchard.Web/Modules/Upgrade/Controllers/TaxonomyController.cs @@ -31,6 +31,8 @@ namespace Upgrade.Controllers { public ILogger Logger { get; set; } public ActionResult Index() { + ViewBag.CanMigrate = false; + if(_featureManager.GetEnabledFeatures().All(x => x.Id != "Orchard.Taxonomies")) { _orchardServices.Notifier.Warning(T("You need to enable Orchard.Taxonomies in order to migrate Contrib.Taxonomies to Orchard.Taxonomies.")); } @@ -43,6 +45,8 @@ namespace Upgrade.Controllers { if (flag) { _orchardServices.Notifier.Warning(T("This migration step might have been done already.")); } + + ViewBag.CanMigrate = true; } return View(); diff --git a/src/Orchard.Web/Modules/Upgrade/Module.txt b/src/Orchard.Web/Modules/Upgrade/Module.txt index 176b1f8f1..34a77b8fb 100644 --- a/src/Orchard.Web/Modules/Upgrade/Module.txt +++ b/src/Orchard.Web/Modules/Upgrade/Module.txt @@ -9,4 +9,4 @@ Category: Developer Features: Upgrade: Description: Provides actions for upgrading Orchard instances - Dependencies: Orchard.Autoroute, Title, Navigation, Orchard.MediaLibrary \ No newline at end of file + Dependencies: Orchard.Autoroute, Title, Navigation \ No newline at end of file diff --git a/src/Orchard.Web/Modules/Upgrade/Views/Media/Index.cshtml b/src/Orchard.Web/Modules/Upgrade/Views/Media/Index.cshtml index 16c84a094..94d630cba 100644 --- a/src/Orchard.Web/Modules/Upgrade/Views/Media/Index.cshtml +++ b/src/Orchard.Web/Modules/Upgrade/Views/Media/Index.cshtml @@ -9,6 +9,8 @@ @T("This migration step will create and organize new Media Content Items based on the media files in your ~/Media folder.")
} \ No newline at end of file diff --git a/src/Orchard.Web/Modules/Upgrade/Views/Taxonomy/Index.cshtml b/src/Orchard.Web/Modules/Upgrade/Views/Taxonomy/Index.cshtml index 221a15d8f..aa5e98bf0 100644 --- a/src/Orchard.Web/Modules/Upgrade/Views/Taxonomy/Index.cshtml +++ b/src/Orchard.Web/Modules/Upgrade/Views/Taxonomy/Index.cshtml @@ -9,6 +9,8 @@ @T("This migration step will convert the Contrib.Taxonomies content items to Orchard.Taxonomies.") } \ No newline at end of file