diff --git a/src/Orchard.Web/Core/Containers/Controllers/ItemController.cs b/src/Orchard.Web/Core/Containers/Controllers/ItemController.cs index 433c57c39..0f13080ac 100644 --- a/src/Orchard.Web/Core/Containers/Controllers/ItemController.cs +++ b/src/Orchard.Web/Core/Containers/Controllers/ItemController.cs @@ -62,12 +62,12 @@ namespace Orchard.Core.Containers.Controllers { var list = Shape.List(); list.AddRange(pageOfItems.Select(item => _contentManager.BuildDisplay(item, "Summary"))); - var viewModel = Shape.ViewModel() + dynamic viewModel = Shape.ViewModel() .ContentItems(list) .Pager(pagerShape) .ShowPager(container.As().Record.Paginated); - return View(viewModel); + return View((object)viewModel); } } } \ No newline at end of file diff --git a/src/Orchard.Web/Core/Contents/Controllers/AdminController.cs b/src/Orchard.Web/Core/Contents/Controllers/AdminController.cs index 1d417fc20..8ca6ea77b 100644 --- a/src/Orchard.Web/Core/Contents/Controllers/AdminController.cs +++ b/src/Orchard.Web/Core/Contents/Controllers/AdminController.cs @@ -91,13 +91,13 @@ namespace Orchard.Core.Contents.Controllers { var list = Shape.List(); list.AddRange(pageOfContentItems.Select(ci => _contentManager.BuildDisplay(ci, "SummaryAdmin"))); - var viewModel = Shape.ViewModel() + dynamic viewModel = Shape.ViewModel() .ContentItems(list) .Pager(pagerShape) .Options(model.Options) .TypeDisplayName(model.TypeDisplayName ?? ""); - return View(viewModel); + return View((object)viewModel); } private IEnumerable GetCreatableTypes() { @@ -174,9 +174,9 @@ namespace Orchard.Core.Contents.Controllers { } ActionResult CreatableTypeList() { - var viewModel = Shape.ViewModel(ContentTypes: GetCreatableTypes()); + dynamic viewModel = Shape.ViewModel(ContentTypes: GetCreatableTypes()); - return View("CreatableTypeList", viewModel); + return View("CreatableTypeList", (object)viewModel); } public ActionResult Create(string id) { @@ -218,10 +218,10 @@ namespace Orchard.Core.Contents.Controllers { contentItem, isDraftable ? VersionOptions.Draft : VersionOptions.Published); - var model = _contentManager.UpdateEditor(contentItem, this); + dynamic model = _contentManager.UpdateEditor(contentItem, this); if (!ModelState.IsValid) { _transactionManager.Cancel(); - return View(model); + return View((object)model); } conditionallyPublish(contentItem); @@ -269,10 +269,10 @@ namespace Orchard.Core.Contents.Controllers { if (!Services.Authorizer.Authorize(Permissions.EditContent, contentItem, T("Couldn't edit content"))) return new HttpUnauthorizedResult(); - var model = _contentManager.UpdateEditor(contentItem, this); + dynamic model = _contentManager.UpdateEditor(contentItem, this); if (!ModelState.IsValid) { _transactionManager.Cancel(); - return View("Edit", model); + return View("Edit", (object)model); } conditionallyPublish(contentItem); diff --git a/src/Orchard.Web/Core/Contents/Controllers/ItemController.cs b/src/Orchard.Web/Core/Contents/Controllers/ItemController.cs index f5ab31e71..fb0791f26 100644 --- a/src/Orchard.Web/Core/Contents/Controllers/ItemController.cs +++ b/src/Orchard.Web/Core/Contents/Controllers/ItemController.cs @@ -18,8 +18,8 @@ namespace Orchard.Core.Contents.Controllers { // /Contents/Item/Display/72 public ActionResult Display(int id) { var contentItem = _contentManager.Get(id, VersionOptions.Published); - var model = _contentManager.BuildDisplay(contentItem); - return View(model); + dynamic model = _contentManager.BuildDisplay(contentItem); + return View((object)model); } // /Contents/Item/Preview/72 @@ -30,8 +30,8 @@ namespace Orchard.Core.Contents.Controllers { versionOptions = VersionOptions.Number((int)version); var contentItem = _contentManager.Get(id, versionOptions); - var model = _contentManager.BuildDisplay(contentItem); - return View("Display", model); + dynamic model = _contentManager.BuildDisplay(contentItem); + return View("Display", (object)model); } } } \ No newline at end of file diff --git a/src/Orchard.Web/Core/Routable/Controllers/ItemController.cs b/src/Orchard.Web/Core/Routable/Controllers/ItemController.cs index 1b4ffae1c..9f45d0512 100644 --- a/src/Orchard.Web/Core/Routable/Controllers/ItemController.cs +++ b/src/Orchard.Web/Core/Routable/Controllers/ItemController.cs @@ -47,8 +47,8 @@ namespace Orchard.Core.Routable.Controllers { throw new ApplicationException("Ambiguous content"); } - var model = _contentManager.BuildDisplay(hits.Single()); - return View(model); + dynamic model = _contentManager.BuildDisplay(hits.Single()); + return View((object)model); } public ActionResult Slugify(string contentType, int? id, int? containerId) { diff --git a/src/Orchard.Web/Core/Settings/Controllers/AdminController.cs b/src/Orchard.Web/Core/Settings/Controllers/AdminController.cs index f191aa8df..b3367bd35 100644 --- a/src/Orchard.Web/Core/Settings/Controllers/AdminController.cs +++ b/src/Orchard.Web/Core/Settings/Controllers/AdminController.cs @@ -34,9 +34,9 @@ namespace Orchard.Core.Settings.Controllers { if (!Services.Authorizer.Authorize(Permissions.ManageSettings, T("Not authorized to manage settings"))) return new HttpUnauthorizedResult(); - var model = Services.ContentManager.BuildEditor(_siteService.GetSiteSettings()); + dynamic model = Services.ContentManager.BuildEditor(_siteService.GetSiteSettings()); - return View(model); + return View((object)model); } [HttpPost, ActionName("Index")] @@ -45,11 +45,11 @@ namespace Orchard.Core.Settings.Controllers { return new HttpUnauthorizedResult(); var site = _siteService.GetSiteSettings(); - var model = Services.ContentManager.UpdateEditor(site, this); + dynamic model = Services.ContentManager.UpdateEditor(site, this); if (!ModelState.IsValid) { Services.TransactionManager.Cancel(); - return View(model); + return View((object)model); } Services.Notifier.Information(T("Settings updated")); diff --git a/src/Orchard.Web/Modules/Orchard.Blogs/Controllers/BlogAdminController.cs b/src/Orchard.Web/Modules/Orchard.Blogs/Controllers/BlogAdminController.cs index 42edc06ce..7953aa1e2 100644 --- a/src/Orchard.Web/Modules/Orchard.Blogs/Controllers/BlogAdminController.cs +++ b/src/Orchard.Web/Modules/Orchard.Blogs/Controllers/BlogAdminController.cs @@ -65,11 +65,11 @@ namespace Orchard.Blogs.Controllers { var blog = Services.ContentManager.New("Blog"); _contentManager.Create(blog, VersionOptions.Draft); - var model = _contentManager.UpdateEditor(blog, this); + dynamic model = _contentManager.UpdateEditor(blog, this); if (!ModelState.IsValid) { _transactionManager.Cancel(); - return View(model); + return View((object)model); } if (!blog.Has()) @@ -100,9 +100,9 @@ namespace Orchard.Blogs.Controllers { if (blog == null) return HttpNotFound(); - var model = Services.ContentManager.UpdateEditor(blog, this); + dynamic model = Services.ContentManager.UpdateEditor(blog, this); if (!ModelState.IsValid) - return View(model); + return View((object)model); _blogSlugConstraint.AddSlug(blog.Slug); Services.Notifier.Information(T("Blog information updated")); @@ -134,10 +134,10 @@ namespace Orchard.Blogs.Controllers { return blog; })); - var viewModel = Services.New.ViewModel() + dynamic viewModel = Services.New.ViewModel() .ContentItems(list); - return View(viewModel); + return View((object)viewModel); } public ActionResult Item(string blogSlug, Pager pager) { @@ -149,7 +149,7 @@ namespace Orchard.Blogs.Controllers { var blogPosts = _blogPostService.Get(blogPart, pager.GetStartIndex(), pager.PageSize, VersionOptions.Latest) .Select(bp => _contentManager.BuildDisplay(bp, "SummaryAdmin")); - var blog = Services.ContentManager.BuildDisplay(blogPart, "DetailAdmin"); + dynamic blog = Services.ContentManager.BuildDisplay(blogPart, "DetailAdmin"); var list = Shape.List(); list.AddRange(blogPosts); @@ -158,7 +158,7 @@ namespace Orchard.Blogs.Controllers { var totalItemCount = _blogPostService.PostCount(blogPart, VersionOptions.Latest); blog.Content.Add(Shape.Pager(pager).TotalItemCount(totalItemCount), "Content:after"); - return View(blog); + return View((object)blog); } bool IUpdateModel.TryUpdateModel(TModel model, string prefix, string[] includeProperties, string[] excludeProperties) { diff --git a/src/Orchard.Web/Modules/Orchard.Blogs/Controllers/BlogController.cs b/src/Orchard.Web/Modules/Orchard.Blogs/Controllers/BlogController.cs index 71f9e8843..a20ed9ab1 100644 --- a/src/Orchard.Web/Modules/Orchard.Blogs/Controllers/BlogController.cs +++ b/src/Orchard.Web/Modules/Orchard.Blogs/Controllers/BlogController.cs @@ -50,10 +50,10 @@ namespace Orchard.Blogs.Controllers { var list = Shape.List(); list.AddRange(blogs); - var viewModel = Shape.ViewModel() + dynamic viewModel = Shape.ViewModel() .ContentItems(list); - return View(viewModel); + return View((object)viewModel); } public ActionResult Item(string blogSlug, Pager pager) { @@ -68,7 +68,7 @@ namespace Orchard.Blogs.Controllers { _feedManager.Register(blogPart); var blogPosts = _blogPostService.Get(blogPart, pager.GetStartIndex(), pager.PageSize) .Select(b => _services.ContentManager.BuildDisplay(b, "Summary")); - var blog = _services.ContentManager.BuildDisplay(blogPart); + dynamic blog = _services.ContentManager.BuildDisplay(blogPart); var list = Shape.List(); list.AddRange(blogPosts); @@ -77,7 +77,7 @@ namespace Orchard.Blogs.Controllers { var totalItemCount = _blogPostService.PostCount(blogPart); blog.Content.Add(Shape.Pager(pager).TotalItemCount(totalItemCount), "Content:after"); - return View(blog); + return View((object)blog); } public ActionResult LiveWriterManifest(string blogSlug) { diff --git a/src/Orchard.Web/Modules/Orchard.Blogs/Controllers/BlogPostController.cs b/src/Orchard.Web/Modules/Orchard.Blogs/Controllers/BlogPostController.cs index d3c252767..1d756e6e2 100644 --- a/src/Orchard.Web/Modules/Orchard.Blogs/Controllers/BlogPostController.cs +++ b/src/Orchard.Web/Modules/Orchard.Blogs/Controllers/BlogPostController.cs @@ -50,9 +50,9 @@ namespace Orchard.Blogs.Controllers { if (postPart == null) return HttpNotFound(); - var model = _services.ContentManager.BuildDisplay(postPart); + dynamic model = _services.ContentManager.BuildDisplay(postPart); - return View(model); + return View((object)model); } public ActionResult ListByArchive(string blogSlug, string archiveData) { @@ -69,7 +69,7 @@ namespace Orchard.Blogs.Controllers { _feedManager.Register(blogPart); - var viewModel = Shape.ViewModel() + dynamic viewModel = Shape.ViewModel() .ContentItems(list) .Blog(blogPart) .ArchiveData(archive); @@ -77,7 +77,7 @@ namespace Orchard.Blogs.Controllers { //todo: (heskew) add back //.ArchiveData(archive) <-- ?? - return View(viewModel); + return View((object)viewModel); } } } \ No newline at end of file diff --git a/src/Orchard.Web/Modules/Orchard.Users/Controllers/AdminController.cs b/src/Orchard.Web/Modules/Orchard.Users/Controllers/AdminController.cs index 7cb65ee83..5dee52fd4 100644 --- a/src/Orchard.Web/Modules/Orchard.Users/Controllers/AdminController.cs +++ b/src/Orchard.Web/Modules/Orchard.Users/Controllers/AdminController.cs @@ -88,7 +88,7 @@ namespace Orchard.Users.Controllers { null, null, true)); } - var model = Services.ContentManager.UpdateEditor(user, this); + dynamic model = Services.ContentManager.UpdateEditor(user, this); if (!ModelState.IsValid) { Services.TransactionManager.Cancel(); @@ -97,7 +97,7 @@ namespace Orchard.Users.Controllers { editor.Metadata.Position = "2"; model.Content.Add(editor); - return View(model); + return View((object)model); } Services.Notifier.Information(T("User created")); @@ -123,7 +123,7 @@ namespace Orchard.Users.Controllers { return new HttpUnauthorizedResult(); var user = Services.ContentManager.Get(id); - var model = Services.ContentManager.UpdateEditor(user, this); + dynamic model = Services.ContentManager.UpdateEditor(user, this); var editModel = new UserEditViewModel {User = user}; TryUpdateModel(editModel); @@ -144,7 +144,7 @@ namespace Orchard.Users.Controllers { editor.Metadata.Position = "2"; model.Content.Add(editor); - return View(model); + return View((object)model); } Services.Notifier.Information(T("User information updated"));