lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2025-09-24 13:33:34 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Medium Trust: Fixing aditional dynamic invocations of View method.

Browse Source 
--HG--
branch : dev
This commit is contained in:
Andre Rodrigues
2010-11-18 11:21:43 -08:00
parent 8956dcb5f5
commit 42fbe44c6b
9 changed files with 40 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/Orchard.Web/Core/Containers/Controllers/ItemController.cs
View File

@@ -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<ContainerPart>().Record.Paginated);
return View(viewModel);
return View((object)viewModel);
}
}
}

16
src/Orchard.Web/Core/Contents/Controllers/AdminController.cs
View File

@@ -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<ContentTypeDefinition> 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) {
@@ -215,10 +215,10 @@ namespace Orchard.Core.Contents.Controllers {
_contentManager.Create(contentItem, VersionOptions.Draft);
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);
@@ -266,10 +266,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);

8
src/Orchard.Web/Core/Contents/Controllers/ItemController.cs
View File

@@ -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);
}
}
}

4
src/Orchard.Web/Core/Routable/Controllers/ItemController.cs
View File

@@ -48,8 +48,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) {

8
src/Orchard.Web/Core/Settings/Controllers/AdminController.cs
View File

@@ -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"));

16
src/Orchard.Web/Modules/Orchard.Blogs/Controllers/BlogAdminController.cs
View File

@@ -66,11 +66,11 @@ namespace Orchard.Blogs.Controllers {
var blog = Services.ContentManager.New<BlogPart>("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);
}
_contentManager.Publish(blog.ContentItem);
@@ -100,10 +100,10 @@ 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) {
Services.TransactionManager.Cancel();
return View(model);
return View((object)model);
}
_contentManager.Publish(blog);
@@ -138,10 +138,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) {
@@ -153,7 +153,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);
@@ -162,7 +162,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>(TModel model, string prefix, string[] includeProperties, string[] excludeProperties) {

8
src/Orchard.Web/Modules/Orchard.Blogs/Controllers/BlogController.cs
View File

@@ -43,10 +43,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) {
@@ -61,7 +61,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);
@@ -70,7 +70,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);
}
}
}

8
src/Orchard.Web/Modules/Orchard.Blogs/Controllers/BlogPostController.cs
View File

@@ -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);
}
}
}

8
src/Orchard.Web/Modules/Orchard.Users/Controllers/AdminController.cs
View File

@@ -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"));