diff --git a/web/ChangeLog b/web/ChangeLog index 88a1d8f4..40180681 100644 --- a/web/ChangeLog +++ b/web/ChangeLog @@ -1,3 +1,11 @@ +2015-06-09 Paul Schneider + + * BlogsController.cs: - cleans unused code + - drops the server side "Preview" notion, made obsolete by + client side MarkdownDeep js + + * Edit.aspx: no more server side preview action + 2015-06-09 Paul Schneider * CircleController.cs: adds a Circle controller diff --git a/web/Controllers/BlogsController.cs b/web/Controllers/BlogsController.cs index 46dcb2f3..997d26d6 100644 --- a/web/Controllers/BlogsController.cs +++ b/web/Controllers/BlogsController.cs @@ -190,7 +190,6 @@ namespace Yavsc.Controllers return UserPost (BlogManager.GetPost (postid)); } } - string prevstr = LocalizedText.Preview; return UserPost (BlogManager.GetPost (user, title)); } /// @@ -209,7 +208,7 @@ namespace Yavsc.Controllers if (String.IsNullOrEmpty (title)) title = ""; ViewData ["UserName"] = un; - return View ("Edit", new BlogEditEntryModel { Title = title }); + return View ("Edit", new BlogEntry { Title = title }); } /// /// Validates the post. @@ -218,16 +217,14 @@ namespace Yavsc.Controllers /// Model. [Authorize, ValidateInput(false)] - public ActionResult ValidatePost (BlogEditEntryModel model) + public ActionResult ValidatePost (BlogEntry model) { string username = Membership.GetUser ().UserName; ViewData ["SiteName"] = sitename; ViewData ["BlogUser"] = username; if (ModelState.IsValid) { - if (!model.Preview) { BlogManager.Post (username, model.Title, model.Content, model.Visible); return UserPost (username, model.Title); - } } return View ("Post", model); } @@ -238,18 +235,16 @@ namespace Yavsc.Controllers /// Model. [Authorize, ValidateInput(false)] - public ActionResult ValidateEdit (BlogEditEntryModel model) + public ActionResult ValidateEdit (BlogEntry model) { ViewData ["SiteName"] = sitename; ViewData ["BlogUser"] = Membership.GetUser ().UserName; if (ModelState.IsValid) { - if (!model.Preview) { if (model.Id != 0) BlogManager.UpdatePost (model.Id, model.Title, model.Content, model.Visible); else BlogManager.Post (model.UserName, model.Title, model.Content, model.Visible); return UserPost(model.UserName, model.Title); - } } return View ("Edit", model); } @@ -259,7 +254,7 @@ namespace Yavsc.Controllers /// Model. [Authorize, ValidateInput(false)] - public ActionResult Edit (BlogEditEntryModel model) + public ActionResult Edit (BlogEntry model) { if (model != null) { string user = Membership.GetUser ().UserName; @@ -275,7 +270,9 @@ namespace Yavsc.Controllers if (e.UserName != user) { return View ("TitleNotFound"); } - model = new BlogEditEntryModel(e); + model = e; + ModelState.Clear (); + TryValidateModel (model); } } return View (model); @@ -286,14 +283,12 @@ namespace Yavsc.Controllers /// /// Model. [Authorize] - public ActionResult Comment (BlogEditCommentModel model) { + public ActionResult Comment (Comment model) { string username = Membership.GetUser ().UserName; ViewData ["SiteName"] = sitename; if (ModelState.IsValid) { - if (!model.Preview) { BlogManager.Comment(username, model.PostId, model.CommentText, model.Visible); return UserPost (model.PostId); - } } return UserPost (model.PostId); } diff --git a/web/Views/Blogs/Edit.aspx b/web/Views/Blogs/Edit.aspx index 76a7a823..6184afb0 100644 --- a/web/Views/Blogs/Edit.aspx +++ b/web/Views/Blogs/Edit.aspx @@ -1,4 +1,4 @@ -<%@ Page Language="C#" Inherits="System.Web.Mvc.ViewPage" MasterPageFile="~/Models/App.master" %> +<%@ Page Language="C#" Inherits="System.Web.Mvc.ViewPage" MasterPageFile="~/Models/App.master" %> ">