diff --git a/src/Orchard.Web/Modules/Orchard.DevTools/Controllers/DataMigrationController.cs b/src/Orchard.Web/Modules/Orchard.DevTools/Controllers/DataMigrationController.cs index 443319d54..e2488d413 100644 --- a/src/Orchard.Web/Modules/Orchard.DevTools/Controllers/DataMigrationController.cs +++ b/src/Orchard.Web/Modules/Orchard.DevTools/Controllers/DataMigrationController.cs @@ -1,23 +1,38 @@ -using System.Web.Mvc; +using System; +using System.Web.Mvc; using Orchard.Data.Migration.Generator; -using Orchard.DevTools.ViewModels; +using Orchard.Localization; +using Orchard.Mvc.ViewModels; +using Orchard.UI.Notify; namespace Orchard.DevTools.Controllers { [ValidateInput(false)] public class DataMigrationController : Controller { private readonly ISchemaCommandGenerator _schemaCommandGenerator; - public DataMigrationController(ISchemaCommandGenerator schemaCommandGenerator) { + public DataMigrationController(ISchemaCommandGenerator schemaCommandGenerator, IOrchardServices orchardServices) { _schemaCommandGenerator = schemaCommandGenerator; + Services = orchardServices; } + public IOrchardServices Services { get; set; } + public Localizer T { get; set; } + public ActionResult Index() { - var model = new DataMigrationIndexViewModel (); - - _schemaCommandGenerator.UpdateDatabase(); - - return View(model); + return View(new BaseViewModel()); } + 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.DevTools/Orchard.DevTools.csproj b/src/Orchard.Web/Modules/Orchard.DevTools/Orchard.DevTools.csproj index 024727911..073d0e9c7 100644 --- a/src/Orchard.Web/Modules/Orchard.DevTools/Orchard.DevTools.csproj +++ b/src/Orchard.Web/Modules/Orchard.DevTools/Orchard.DevTools.csproj @@ -86,7 +86,6 @@ - diff --git a/src/Orchard.Web/Modules/Orchard.DevTools/ViewModels/DataMigrationIndexViewModel.cs b/src/Orchard.Web/Modules/Orchard.DevTools/ViewModels/DataMigrationIndexViewModel.cs deleted file mode 100644 index bf5b7e0a1..000000000 --- a/src/Orchard.Web/Modules/Orchard.DevTools/ViewModels/DataMigrationIndexViewModel.cs +++ /dev/null @@ -1,6 +0,0 @@ -using Orchard.Mvc.ViewModels; - -namespace Orchard.DevTools.ViewModels { - public class DataMigrationIndexViewModel : BaseViewModel { - } -} \ No newline at end of file diff --git a/src/Orchard.Web/Modules/Orchard.DevTools/Views/DataMigration/Index.aspx b/src/Orchard.Web/Modules/Orchard.DevTools/Views/DataMigration/Index.aspx index 962308436..b02ec3b03 100644 --- a/src/Orchard.Web/Modules/Orchard.DevTools/Views/DataMigration/Index.aspx +++ b/src/Orchard.Web/Modules/Orchard.DevTools/Views/DataMigration/Index.aspx @@ -1,9 +1,5 @@ -<%@ Page Language="C#" Inherits="Orchard.Mvc.ViewPage" %> +<%@ Page Language="C#" Inherits="Orchard.Mvc.ViewPage"%> +<%@ Import Namespace="Orchard.Mvc.ViewModels"%> +

<%: Html.TitleForPage(T("Data migration").ToString()) %>

+

<%: Html.ActionLink(T("Update database").ToString(), "UpdateDatabase", "DataMigration") %>

- -

Data Migration

diff --git a/src/Orchard.Web/Modules/Orchard.DevTools/Views/Home/Index.aspx b/src/Orchard.Web/Modules/Orchard.DevTools/Views/Home/Index.aspx index 5b1a2def6..3e7859f27 100644 --- a/src/Orchard.Web/Modules/Orchard.DevTools/Views/Home/Index.aspx +++ b/src/Orchard.Web/Modules/Orchard.DevTools/Views/Home/Index.aspx @@ -4,4 +4,4 @@

<%: Html.ActionLink(T("Contents").ToString(), "Index", "Content") %>

<%: Html.ActionLink(T("Metadata").ToString(), "Index", "Metadata") %>

<%: Html.ActionLink(T("Test Unauthorized Request").ToString(), "NotAuthorized", "Home")%>

- +

<%: Html.ActionLink(T("Data migration").ToString(), "Index", "DataMigration")%>