From 34429ef833e55869868263792fd51c88412c5587 Mon Sep 17 00:00:00 2001 From: Sebastien Ros Date: Wed, 17 Nov 2010 14:15:02 -0800 Subject: [PATCH] Removing view for database update http://orchard.codeplex.com/workitem/16576 http://orchard.codeplex.com/workitem/16781 --HG-- branch : dev --- .../Modules/Orchard.Migrations/AdminMenu.cs | 14 ------ .../Controllers/DatabaseUpdateController.cs | 40 ---------------- .../Modules/Orchard.Migrations/Module.txt | 4 -- .../Orchard.Migrations.csproj | 5 -- .../Modules/Orchard.Migrations/Routes.cs | 47 ------------------- .../Views/DatabaseUpdate/Index.cshtml | 2 - .../Orchard.Migrations/Views/Web.config | 32 ------------- 7 files changed, 144 deletions(-) delete mode 100644 src/Orchard.Web/Modules/Orchard.Migrations/AdminMenu.cs delete mode 100644 src/Orchard.Web/Modules/Orchard.Migrations/Controllers/DatabaseUpdateController.cs delete mode 100644 src/Orchard.Web/Modules/Orchard.Migrations/Routes.cs delete mode 100644 src/Orchard.Web/Modules/Orchard.Migrations/Views/DatabaseUpdate/Index.cshtml delete mode 100644 src/Orchard.Web/Modules/Orchard.Migrations/Views/Web.config diff --git a/src/Orchard.Web/Modules/Orchard.Migrations/AdminMenu.cs b/src/Orchard.Web/Modules/Orchard.Migrations/AdminMenu.cs deleted file mode 100644 index da250a77f..000000000 --- a/src/Orchard.Web/Modules/Orchard.Migrations/AdminMenu.cs +++ /dev/null @@ -1,14 +0,0 @@ -using Orchard.Localization; -using Orchard.UI.Navigation; - -namespace Orchard.Migrations { - public class AdminMenu : INavigationProvider { - public Localizer T { get; set; } - public string MenuName { get { return "admin"; } } - - public void GetNavigation(NavigationBuilder builder) { - builder.Add(T("Developer"), "1", - menu => menu.Add(T("Migration"), "1.0", item => item.Action("Index", "DatabaseUpdate", new { area = "Orchard.Migrations" }))); - } - } -} \ No newline at end of file diff --git a/src/Orchard.Web/Modules/Orchard.Migrations/Controllers/DatabaseUpdateController.cs b/src/Orchard.Web/Modules/Orchard.Migrations/Controllers/DatabaseUpdateController.cs deleted file mode 100644 index 98bfaae56..000000000 --- a/src/Orchard.Web/Modules/Orchard.Migrations/Controllers/DatabaseUpdateController.cs +++ /dev/null @@ -1,40 +0,0 @@ -using System; -using System.Web.Mvc; -using Orchard.Data.Migration.Generator; -using Orchard.Environment.Extensions; -using Orchard.Localization; -using Orchard.UI.Admin; -using Orchard.UI.Notify; - -namespace Orchard.Migrations.Controllers { - - [ValidateInput(false)] - [Admin, OrchardFeature("DatabaseUpdate")] - public class DatabaseUpdateController : Controller { - private readonly ISchemaCommandGenerator _schemaCommandGenerator; - - public DatabaseUpdateController(ISchemaCommandGenerator schemaCommandGenerator, IOrchardServices orchardServices) { - _schemaCommandGenerator = schemaCommandGenerator; - Services = orchardServices; - } - - public IOrchardServices Services { get; set; } - public Localizer T { get; set; } - - public ActionResult Index() { - return View(); - } - - public ActionResult UpdateDatabase() { - try { - _schemaCommandGenerator.UpdateDatabase(); - Services.Notifier.Information(T("Database updated successfuly")); - } - catch (Exception ex) { - Services.Notifier.Error(T("An error occured while updating the database: {0}", ex.Message)); - } - - return RedirectToAction("Index"); - } - } -} \ No newline at end of file diff --git a/src/Orchard.Web/Modules/Orchard.Migrations/Module.txt b/src/Orchard.Web/Modules/Orchard.Migrations/Module.txt index 9c801b6fa..8be06d31c 100644 --- a/src/Orchard.Web/Modules/Orchard.Migrations/Module.txt +++ b/src/Orchard.Web/Modules/Orchard.Migrations/Module.txt @@ -9,7 +9,3 @@ Features: Orchard.Migrations: Description: Data migration commands. Category: Developer - DatabaseUpdate: - Description: Automatically updates database schema. - Dependencies: Orchard.Migrations - Category: Developer diff --git a/src/Orchard.Web/Modules/Orchard.Migrations/Orchard.Migrations.csproj b/src/Orchard.Web/Modules/Orchard.Migrations/Orchard.Migrations.csproj index 17e8802a1..525e4faab 100644 --- a/src/Orchard.Web/Modules/Orchard.Migrations/Orchard.Migrations.csproj +++ b/src/Orchard.Web/Modules/Orchard.Migrations/Orchard.Migrations.csproj @@ -69,16 +69,11 @@ - - - - - diff --git a/src/Orchard.Web/Modules/Orchard.Migrations/Routes.cs b/src/Orchard.Web/Modules/Orchard.Migrations/Routes.cs deleted file mode 100644 index f642a4647..000000000 --- a/src/Orchard.Web/Modules/Orchard.Migrations/Routes.cs +++ /dev/null @@ -1,47 +0,0 @@ -using System.Collections.Generic; -using System.Web.Mvc; -using System.Web.Routing; -using Orchard.Mvc.Routes; - -namespace Orchard.Migrations { - public class Routes : IRouteProvider { - - public void GetRoutes(ICollection routes) { - foreach (var routeDescriptor in GetRoutes()) - routes.Add(routeDescriptor); - } - - public IEnumerable GetRoutes() { - return new[] { - new RouteDescriptor { - Route = new Route( - "Admin/Migrations/", - new RouteValueDictionary { - {"area", "Orchard.Migrations"}, - {"controller", "DatabaseUpdate"}, - {"action", "Index"} - }, - new RouteValueDictionary(), - new RouteValueDictionary { - {"area", "Orchard.Migrations"} - }, - new MvcRouteHandler()) - }, - new RouteDescriptor { - Route = new Route( - "Admin/Migrations/UpdateDatabase", - new RouteValueDictionary { - {"area", "Orchard.Migrations"}, - {"controller", "DatabaseUpdate"}, - {"action", "UpdateDatabase"} - }, - new RouteValueDictionary(), - new RouteValueDictionary { - {"area", "Orchard.Migrations"} - }, - new MvcRouteHandler()) - } - }; - } - } -} \ No newline at end of file diff --git a/src/Orchard.Web/Modules/Orchard.Migrations/Views/DatabaseUpdate/Index.cshtml b/src/Orchard.Web/Modules/Orchard.Migrations/Views/DatabaseUpdate/Index.cshtml deleted file mode 100644 index 0860d2718..000000000 --- a/src/Orchard.Web/Modules/Orchard.Migrations/Views/DatabaseUpdate/Index.cshtml +++ /dev/null @@ -1,2 +0,0 @@ -

@Html.TitleForPage(T("Data Migration").ToString())

-

@Html.ActionLink(T("Update Database").ToString(), "UpdateDatabase", "DatabaseUpdate")

\ No newline at end of file diff --git a/src/Orchard.Web/Modules/Orchard.Migrations/Views/Web.config b/src/Orchard.Web/Modules/Orchard.Migrations/Views/Web.config deleted file mode 100644 index 53bb749f4..000000000 --- a/src/Orchard.Web/Modules/Orchard.Migrations/Views/Web.config +++ /dev/null @@ -1,32 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - -