Skip to content
Browse files

Reverting the Body->Content change

  • Loading branch information...
1 parent b8970fe commit e7a930be6fb85c6d21aba15c676f773060ce947a @ayende committed Nov 11, 2011
View
2 HibernatingRhinos.Loci.Common/Models/DynamicContent.cs
@@ -10,7 +10,7 @@ public enum DynamicContentType
public interface IDynamicContent
{
- string Content { get; set; }
+ string Body { get; set; }
DynamicContentType ContentType { get; set; }
}
View
2 RaccoonBlog.Web/Areas/Admin/Controllers/PostsController.cs
@@ -62,7 +62,7 @@ public ActionResult Add(PostInput input)
LastEditedAt = DateTimeOffset.Now,
CommentsId = comments.Id,
ContentType = input.ContentType,
- Content = input.Body,
+ Body = input.Body,
CreatedAt = DateTimeOffset.Now,
Title = input.Title,
};
View
4 RaccoonBlog.Web/Helpers/DynamicContentHelpers.cs
@@ -29,12 +29,12 @@ public static MvcHtmlString CompiledContent(this IDynamicContent contentItem, bo
NewWindowForExternalLinks = true,
};
- var contents = contentItem.Content;
+ var contents = contentItem.Body;
contents = CodeBlockFinder.Replace(contents, match => GenerateCodeBlock(match.Groups[1].Value.Trim(), match.Groups[2].Value));
contents = md.Transform(contents);
return MvcHtmlString.Create(contents);
case DynamicContentType.Html:
- return trustContent ? MvcHtmlString.Create(contentItem.Content) : MvcHtmlString.Empty;
+ return trustContent ? MvcHtmlString.Create(contentItem.Body) : MvcHtmlString.Empty;
}
return MvcHtmlString.Empty;
}
View
3 RaccoonBlog.Web/Models/Post.cs
@@ -23,8 +23,7 @@ public Post()
public string Title { get; set; }
public string LegacySlug { get; set; }
- [JsonProperty(PropertyName = "Body")]
- public string Content { get; set; }
+ public string Body { get; set; }
public DynamicContentType ContentType { get; set; }
public ICollection<string> Tags { get; set; }
View
4 RaccoonBlog.Web/Services/MetaWeblog.cs
@@ -46,7 +46,7 @@ string IMetaWeblog.AddPost(string blogid, string username, string password, Post
newPost = new Models.Post
{
AuthorId = user.Id,
- Content = post.description,
+ Body = post.description,
CommentsId = comments.Id,
CreatedAt = DateTimeOffset.Now,
SkipAutoReschedule = post.dateCreated != null,
@@ -88,7 +88,7 @@ bool IMetaWeblog.UpdatePost(string postid, string username, string password, Pos
postToEdit.LastEditedAt = DateTimeOffset.Now;
}
- postToEdit.Content = post.description;
+ postToEdit.Body = post.description;
if (
// don't bother moving things if we are already talking about something that is fixed
postToEdit.SkipAutoReschedule &&
View
2 RaccoonBlog.Web/Web.config
@@ -58,7 +58,7 @@
</system.net>
<connectionStrings>
<add name="ApplicationServices" connectionString="data source=.\SQLEXPRESS;Integrated Security=SSPI;AttachDBFilename=|DataDirectory|aspnetdb.mdf;User Instance=true" providerName="System.Data.SqlClient" />
- <add name="RavenDB" connectionString="Url=http://localhost:8080;Database=Raccoon" />
+ <add name="RavenDB" connectionString="Url=http://localhost:8080" />
</connectionStrings>
<appSettings>
<add key="ReCaptchaPrivateKey" value="6Le1ZcMSAAAAAC9VnxL6908-iMk7SNGLq3CmLF8V" />
View
154 RaccoonBlog.sln
@@ -1,77 +1,77 @@
-Microsoft Visual Studio Solution File, Format Version 11.00
-# Visual Studio 2010
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RaccoonBlog.Web", "RaccoonBlog.Web\RaccoonBlog.Web.csproj", "{58CCD7A4-503D-467D-8DC4-4D310BD42774}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RaccoonBlog.ImportFromSubtext", "RaccoonBlog.ImportFromSubtext\RaccoonBlog.ImportFromSubtext.csproj", "{B8756E91-C4CB-4E8F-ACE1-B455DE31C4C4}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RaccoonBlog.IntegrationTests", "RaccoonBlog.IntegrationTests\RaccoonBlog.IntegrationTests.csproj", "{03EBB446-3306-4F60-B49F-29E4737CEAFC}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RaccoonBlog.Migrations", "RaccoonBlog.Migrations\RaccoonBlog.Migrations.csproj", "{9A577574-D910-4B66-9499-CF31B5ED8B0E}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Loci.Common", "HibernatingRhinos.Loci.Common\Loci.Common.csproj", "{238D8AAA-FD89-48E7-9446-ADCDE845B58E}"
-EndProject
-Global
- GlobalSection(SolutionConfigurationPlatforms) = preSolution
- Debug|Any CPU = Debug|Any CPU
- Debug|Mixed Platforms = Debug|Mixed Platforms
- Debug|x86 = Debug|x86
- Release|Any CPU = Release|Any CPU
- Release|Mixed Platforms = Release|Mixed Platforms
- Release|x86 = Release|x86
- EndGlobalSection
- GlobalSection(ProjectConfigurationPlatforms) = postSolution
- {58CCD7A4-503D-467D-8DC4-4D310BD42774}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {58CCD7A4-503D-467D-8DC4-4D310BD42774}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {58CCD7A4-503D-467D-8DC4-4D310BD42774}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
- {58CCD7A4-503D-467D-8DC4-4D310BD42774}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
- {58CCD7A4-503D-467D-8DC4-4D310BD42774}.Debug|x86.ActiveCfg = Debug|Any CPU
- {58CCD7A4-503D-467D-8DC4-4D310BD42774}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {58CCD7A4-503D-467D-8DC4-4D310BD42774}.Release|Any CPU.Build.0 = Release|Any CPU
- {58CCD7A4-503D-467D-8DC4-4D310BD42774}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
- {58CCD7A4-503D-467D-8DC4-4D310BD42774}.Release|Mixed Platforms.Build.0 = Release|Any CPU
- {58CCD7A4-503D-467D-8DC4-4D310BD42774}.Release|x86.ActiveCfg = Release|Any CPU
- {B8756E91-C4CB-4E8F-ACE1-B455DE31C4C4}.Debug|Any CPU.ActiveCfg = Debug|x86
- {B8756E91-C4CB-4E8F-ACE1-B455DE31C4C4}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
- {B8756E91-C4CB-4E8F-ACE1-B455DE31C4C4}.Debug|Mixed Platforms.Build.0 = Debug|x86
- {B8756E91-C4CB-4E8F-ACE1-B455DE31C4C4}.Debug|x86.ActiveCfg = Debug|x86
- {B8756E91-C4CB-4E8F-ACE1-B455DE31C4C4}.Debug|x86.Build.0 = Debug|x86
- {B8756E91-C4CB-4E8F-ACE1-B455DE31C4C4}.Release|Any CPU.ActiveCfg = Release|x86
- {B8756E91-C4CB-4E8F-ACE1-B455DE31C4C4}.Release|Mixed Platforms.ActiveCfg = Release|x86
- {B8756E91-C4CB-4E8F-ACE1-B455DE31C4C4}.Release|Mixed Platforms.Build.0 = Release|x86
- {B8756E91-C4CB-4E8F-ACE1-B455DE31C4C4}.Release|x86.ActiveCfg = Release|x86
- {B8756E91-C4CB-4E8F-ACE1-B455DE31C4C4}.Release|x86.Build.0 = Release|x86
- {03EBB446-3306-4F60-B49F-29E4737CEAFC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {03EBB446-3306-4F60-B49F-29E4737CEAFC}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {03EBB446-3306-4F60-B49F-29E4737CEAFC}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
- {03EBB446-3306-4F60-B49F-29E4737CEAFC}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
- {03EBB446-3306-4F60-B49F-29E4737CEAFC}.Debug|x86.ActiveCfg = Debug|Any CPU
- {03EBB446-3306-4F60-B49F-29E4737CEAFC}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {03EBB446-3306-4F60-B49F-29E4737CEAFC}.Release|Any CPU.Build.0 = Release|Any CPU
- {03EBB446-3306-4F60-B49F-29E4737CEAFC}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
- {03EBB446-3306-4F60-B49F-29E4737CEAFC}.Release|Mixed Platforms.Build.0 = Release|Any CPU
- {03EBB446-3306-4F60-B49F-29E4737CEAFC}.Release|x86.ActiveCfg = Release|Any CPU
- {9A577574-D910-4B66-9499-CF31B5ED8B0E}.Debug|Any CPU.ActiveCfg = Debug|x86
- {9A577574-D910-4B66-9499-CF31B5ED8B0E}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
- {9A577574-D910-4B66-9499-CF31B5ED8B0E}.Debug|Mixed Platforms.Build.0 = Debug|x86
- {9A577574-D910-4B66-9499-CF31B5ED8B0E}.Debug|x86.ActiveCfg = Debug|x86
- {9A577574-D910-4B66-9499-CF31B5ED8B0E}.Debug|x86.Build.0 = Debug|x86
- {9A577574-D910-4B66-9499-CF31B5ED8B0E}.Release|Any CPU.ActiveCfg = Release|x86
- {9A577574-D910-4B66-9499-CF31B5ED8B0E}.Release|Mixed Platforms.ActiveCfg = Release|x86
- {9A577574-D910-4B66-9499-CF31B5ED8B0E}.Release|Mixed Platforms.Build.0 = Release|x86
- {9A577574-D910-4B66-9499-CF31B5ED8B0E}.Release|x86.ActiveCfg = Release|x86
- {9A577574-D910-4B66-9499-CF31B5ED8B0E}.Release|x86.Build.0 = Release|x86
- {238D8AAA-FD89-48E7-9446-ADCDE845B58E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {238D8AAA-FD89-48E7-9446-ADCDE845B58E}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {238D8AAA-FD89-48E7-9446-ADCDE845B58E}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
- {238D8AAA-FD89-48E7-9446-ADCDE845B58E}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
- {238D8AAA-FD89-48E7-9446-ADCDE845B58E}.Debug|x86.ActiveCfg = Debug|Any CPU
- {238D8AAA-FD89-48E7-9446-ADCDE845B58E}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {238D8AAA-FD89-48E7-9446-ADCDE845B58E}.Release|Any CPU.Build.0 = Release|Any CPU
- {238D8AAA-FD89-48E7-9446-ADCDE845B58E}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
- {238D8AAA-FD89-48E7-9446-ADCDE845B58E}.Release|Mixed Platforms.Build.0 = Release|Any CPU
- {238D8AAA-FD89-48E7-9446-ADCDE845B58E}.Release|x86.ActiveCfg = Release|Any CPU
- EndGlobalSection
- GlobalSection(SolutionProperties) = preSolution
- HideSolutionNode = FALSE
- EndGlobalSection
-EndGlobal
+Microsoft Visual Studio Solution File, Format Version 11.00
+# Visual Studio 2010
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RaccoonBlog.Web", "RaccoonBlog.Web\RaccoonBlog.Web.csproj", "{58CCD7A4-503D-467D-8DC4-4D310BD42774}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RaccoonBlog.ImportFromSubtext", "RaccoonBlog.ImportFromSubtext\RaccoonBlog.ImportFromSubtext.csproj", "{B8756E91-C4CB-4E8F-ACE1-B455DE31C4C4}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RaccoonBlog.IntegrationTests", "RaccoonBlog.IntegrationTests\RaccoonBlog.IntegrationTests.csproj", "{03EBB446-3306-4F60-B49F-29E4737CEAFC}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RaccoonBlog.Migrations", "RaccoonBlog.Migrations\RaccoonBlog.Migrations.csproj", "{9A577574-D910-4B66-9499-CF31B5ED8B0E}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Loci.Common", "HibernatingRhinos.Loci.Common\Loci.Common.csproj", "{238D8AAA-FD89-48E7-9446-ADCDE845B58E}"
+EndProject
+Global
+ GlobalSection(SolutionConfigurationPlatforms) = preSolution
+ Debug|Any CPU = Debug|Any CPU
+ Debug|Mixed Platforms = Debug|Mixed Platforms
+ Debug|x86 = Debug|x86
+ Release|Any CPU = Release|Any CPU
+ Release|Mixed Platforms = Release|Mixed Platforms
+ Release|x86 = Release|x86
+ EndGlobalSection
+ GlobalSection(ProjectConfigurationPlatforms) = postSolution
+ {58CCD7A4-503D-467D-8DC4-4D310BD42774}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {58CCD7A4-503D-467D-8DC4-4D310BD42774}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {58CCD7A4-503D-467D-8DC4-4D310BD42774}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+ {58CCD7A4-503D-467D-8DC4-4D310BD42774}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+ {58CCD7A4-503D-467D-8DC4-4D310BD42774}.Debug|x86.ActiveCfg = Debug|Any CPU
+ {58CCD7A4-503D-467D-8DC4-4D310BD42774}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {58CCD7A4-503D-467D-8DC4-4D310BD42774}.Release|Any CPU.Build.0 = Release|Any CPU
+ {58CCD7A4-503D-467D-8DC4-4D310BD42774}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+ {58CCD7A4-503D-467D-8DC4-4D310BD42774}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+ {58CCD7A4-503D-467D-8DC4-4D310BD42774}.Release|x86.ActiveCfg = Release|Any CPU
+ {B8756E91-C4CB-4E8F-ACE1-B455DE31C4C4}.Debug|Any CPU.ActiveCfg = Debug|x86
+ {B8756E91-C4CB-4E8F-ACE1-B455DE31C4C4}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
+ {B8756E91-C4CB-4E8F-ACE1-B455DE31C4C4}.Debug|Mixed Platforms.Build.0 = Debug|x86
+ {B8756E91-C4CB-4E8F-ACE1-B455DE31C4C4}.Debug|x86.ActiveCfg = Debug|x86
+ {B8756E91-C4CB-4E8F-ACE1-B455DE31C4C4}.Debug|x86.Build.0 = Debug|x86
+ {B8756E91-C4CB-4E8F-ACE1-B455DE31C4C4}.Release|Any CPU.ActiveCfg = Release|x86
+ {B8756E91-C4CB-4E8F-ACE1-B455DE31C4C4}.Release|Mixed Platforms.ActiveCfg = Release|x86
+ {B8756E91-C4CB-4E8F-ACE1-B455DE31C4C4}.Release|Mixed Platforms.Build.0 = Release|x86
+ {B8756E91-C4CB-4E8F-ACE1-B455DE31C4C4}.Release|x86.ActiveCfg = Release|x86
+ {B8756E91-C4CB-4E8F-ACE1-B455DE31C4C4}.Release|x86.Build.0 = Release|x86
+ {03EBB446-3306-4F60-B49F-29E4737CEAFC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {03EBB446-3306-4F60-B49F-29E4737CEAFC}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {03EBB446-3306-4F60-B49F-29E4737CEAFC}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+ {03EBB446-3306-4F60-B49F-29E4737CEAFC}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+ {03EBB446-3306-4F60-B49F-29E4737CEAFC}.Debug|x86.ActiveCfg = Debug|Any CPU
+ {03EBB446-3306-4F60-B49F-29E4737CEAFC}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {03EBB446-3306-4F60-B49F-29E4737CEAFC}.Release|Any CPU.Build.0 = Release|Any CPU
+ {03EBB446-3306-4F60-B49F-29E4737CEAFC}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+ {03EBB446-3306-4F60-B49F-29E4737CEAFC}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+ {03EBB446-3306-4F60-B49F-29E4737CEAFC}.Release|x86.ActiveCfg = Release|Any CPU
+ {9A577574-D910-4B66-9499-CF31B5ED8B0E}.Debug|Any CPU.ActiveCfg = Debug|x86
+ {9A577574-D910-4B66-9499-CF31B5ED8B0E}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
+ {9A577574-D910-4B66-9499-CF31B5ED8B0E}.Debug|Mixed Platforms.Build.0 = Debug|x86
+ {9A577574-D910-4B66-9499-CF31B5ED8B0E}.Debug|x86.ActiveCfg = Debug|x86
+ {9A577574-D910-4B66-9499-CF31B5ED8B0E}.Debug|x86.Build.0 = Debug|x86
+ {9A577574-D910-4B66-9499-CF31B5ED8B0E}.Release|Any CPU.ActiveCfg = Release|x86
+ {9A577574-D910-4B66-9499-CF31B5ED8B0E}.Release|Mixed Platforms.ActiveCfg = Release|x86
+ {9A577574-D910-4B66-9499-CF31B5ED8B0E}.Release|Mixed Platforms.Build.0 = Release|x86
+ {9A577574-D910-4B66-9499-CF31B5ED8B0E}.Release|x86.ActiveCfg = Release|x86
+ {9A577574-D910-4B66-9499-CF31B5ED8B0E}.Release|x86.Build.0 = Release|x86
+ {238D8AAA-FD89-48E7-9446-ADCDE845B58E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {238D8AAA-FD89-48E7-9446-ADCDE845B58E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {238D8AAA-FD89-48E7-9446-ADCDE845B58E}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+ {238D8AAA-FD89-48E7-9446-ADCDE845B58E}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+ {238D8AAA-FD89-48E7-9446-ADCDE845B58E}.Debug|x86.ActiveCfg = Debug|Any CPU
+ {238D8AAA-FD89-48E7-9446-ADCDE845B58E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {238D8AAA-FD89-48E7-9446-ADCDE845B58E}.Release|Any CPU.Build.0 = Release|Any CPU
+ {238D8AAA-FD89-48E7-9446-ADCDE845B58E}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+ {238D8AAA-FD89-48E7-9446-ADCDE845B58E}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+ {238D8AAA-FD89-48E7-9446-ADCDE845B58E}.Release|x86.ActiveCfg = Release|Any CPU
+ EndGlobalSection
+ GlobalSection(SolutionProperties) = preSolution
+ HideSolutionNode = FALSE
+ EndGlobalSection
+EndGlobal

0 comments on commit e7a930b

Please sign in to comment.
Something went wrong with that request. Please try again.