lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2026-01-22 21:02:08 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Bug fixes

Browse Source 
Remove unused comment settings
Fix "Edit" action link for pages (front-end)
Creating a draft shouldn't unpublish the page/blog post anymore

--HG--
extra : convert_revision : svn%3A5ff7c347-ad56-4c35-b696-ccb81de16e03/trunk%4046002
This commit is contained in:
rpaquay
2010-01-27 02:30:04 +00:00
parent 91b0af0591
commit 5d797fed00
9 changed files with 8 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Orchard.Web/Packages/Orchard.Blogs/Controllers/BlogPostAdminController.cs
View File

@@ -137,7 +137,7 @@ namespace Orchard.Blogs.Controllers {
_services.Notifier.Information(T("Blog post has been scheduled for publishing"));
break;
default:
_blogPostService.Unpublish(model.BlogPost.Item);
//_blogPostService.Unpublish(model.BlogPost.Item);
_services.Notifier.Information(T("Blog post draft has been saved"));
break;
}

7
src/Orchard.Web/Packages/Orchard.Comments/Models/CommentSettingsHandler.cs
View File

@@ -7,15 +7,10 @@ namespace Orchard.Comments.Models {
public CommentSettingsHandler(IRepository<CommentSettingsRecord> repository) {
_commentSettingsRepository = repository;
Filters.Add(new ActivatingFilter<CommentSettings>("site"));
Filters.Add(StorageFilter.For(_commentSettingsRepository));
Filters.Add(new TemplateFilterForRecord<CommentSettingsRecord>("CommentSettings", "Parts/Comments.SiteSettings"));
OnActivated<CommentSettings>(DefaultSettings);
}
private static void DefaultSettings(ActivatedContentContext context, CommentSettings settings) {
settings.Record.EnableCommentsOnPages = true;
settings.Record.EnableCommentsOnPosts = true;
}
}
}

2
src/Orchard.Web/Packages/Orchard.Comments/Models/CommentSettingsRecord.cs
View File

@@ -3,8 +3,6 @@ using Orchard.ContentManagement.Records;
namespace Orchard.Comments.Models {
public class CommentSettingsRecord : ContentPartRecord {
public virtual bool RequireLoginToAddComment { get; set; }
public virtual bool EnableCommentsOnPages { get; set; }
public virtual bool EnableCommentsOnPosts { get; set; }
public virtual bool EnableSpamProtection { get; set; }
public virtual string AkismetKey { get; set; }
public virtual string AkismetUrl { get; set; }

10
src/Orchard.Web/Packages/Orchard.Comments/Views/EditorTemplates/Parts/Comments.SiteSettings.ascx
View File

@@ -2,16 +2,6 @@
<%@ Import Namespace="Orchard.Comments.Models"%>
<fieldset>
<legend><%=_Encoded("Comments")%></legend>
<div>
<%=Html.EditorFor(m => m.EnableCommentsOnPages) %>
<label class="forcheckbox" for="CommentSettings_EnableCommentsOnPages"><%=_Encoded("Enable comments on pages")%></label>
<%=Html.ValidationMessage("EnableCommentsOnPages", "*")%>
</div>
<div>
<%=Html.EditorFor(m => m.EnableCommentsOnPosts) %>
<label class="forcheckbox" for="CommentSettings_EnableCommentsOnPosts"><%=_Encoded("Enable comments on blog posts")%></label>
<%=Html.ValidationMessage("EnableCommentsOnPosts", "*")%>
</div>
<div>
<%=Html.EditorFor(m => m.RequireLoginToAddComment) %>
<label class="forcheckbox" for="CommentSettings_RequireLoginToAddComment"><%=_Encoded("Require login to comment")%></label>

4
src/Orchard.Web/Packages/Orchard.Pages/Controllers/AdminController.cs
View File

@@ -45,7 +45,7 @@ namespace Orchard.Pages.Controllers {
default:
throw new ArgumentOutOfRangeException();
}
var entries = pages.Select(page => CreatePageEntry(page)).ToList();
var entries = pages.Select(page => CreatePageEntry(page)).OrderBy(pageEntry => pageEntry.Page.Title).ToList();
var model = new PagesViewModel { Options = options, PageEntries = entries };
return View(model);
}
@@ -195,7 +195,7 @@ namespace Orchard.Pages.Controllers {
Services.Notifier.Information(T("Page has been scheduled for publishing"));
break;
default:
_pageService.Unpublish(model.Page.Item);
//_pageService.Unpublish(model.Page.Item);
Services.Notifier.Information(T("Page draft has been saved"));
break;
}

2
src/Orchard.Web/Packages/Orchard.Pages/Services/SlugConstraint.cs
View File

@@ -51,7 +51,7 @@ namespace Orchard.Pages.Services {
public void AddPublishedSlug(string slug) {
lock (_syncLock) {
_currentlyPublishedSlugs.Add(slug, slug);
_currentlyPublishedSlugs[slug] = slug;
}
}

2
src/Orchard.Web/Packages/Orchard.Pages/Views/DisplayTemplates/Items/Pages.Page.ascx
View File

@@ -1,7 +1,7 @@
<%@ Control Language="C#" Inherits="Orchard.Mvc.ViewUserControl<ContentItemViewModel<Orchard.Pages.Models.Page>>" %>
<%@ Import Namespace="Orchard.Mvc.Html"%>
<%@ Import Namespace="Orchard.Mvc.ViewModels"%>
<div class="manage"><a href="<%=Url.Action(T("Edit").ToString(), "Admin", new {pageSlug = Model.Item.Slug}) %>" class="ibutton edit"><%=_Encoded("edit")%></a></div>
<div class="manage"><a href="<%=Url.Action(T("Edit").ToString(), "Admin", new {id = Model.Item.Id, area = "Orchard.Pages"}) %>" class="ibutton edit"><%=_Encoded("edit")%></a></div>
<h1><%=Html.TitleForPage(Model.Item.Title)%></h1>
<div class="metadata">
<div class="posted">Published by <%=Model.Item.Creator != null ? Html.Encode(Model.Item.Creator.UserName) : _Encoded("nobody(?)").ToString()%></div>

2
src/Orchard.Web/Themes/Classic/Views/DisplayTemplates/Items/Pages.Page.ascx
View File

@@ -2,7 +2,7 @@
<%@ Import Namespace="Orchard.Mvc.Html"%>
<%@ Import Namespace="Orchard.Mvc.ViewModels"%>
<h1><%=Html.TitleForPage(Model.Item.Title)%></h1>
<div class="manage"><a href="<%=Url.Action(T("Edit").ToString(), "Admin", new {pageSlug = Model.Item.Slug}) %>" class="ibutton edit"><%=_Encoded("Edit")%></a></div>
<div class="manage"><a href="<%=Url.Action(T("Edit").ToString(), "Admin", new {id = Model.Item.Id, area = "Orchard.Pages"}) %>" class="ibutton edit"><%=_Encoded("Edit")%></a></div>
<div class="metadata">
<div class="posted">Published by <%=Model.Item.Creator != null ? Html.Encode(Model.Item.Creator.UserName) : _Encoded("nobody(?)").ToString()%></div>
</div>

2
src/Orchard.Web/Themes/Green/Views/DisplayTemplates/Items/Pages.Page.ascx
View File

@@ -2,7 +2,7 @@
<%@ Import Namespace="Orchard.Mvc.Html"%>
<%@ Import Namespace="Orchard.Mvc.ViewModels"%>
<h1><%=Html.TitleForPage(Model.Item.Title)%></h1>
<div class="manage"><a href="<%=Url.Action(T("Edit").ToString(), "Admin", new {pageSlug = Model.Item.Slug}) %>" class="ibutton edit"><%=_Encoded("Edit")%></a></div>
<div class="manage"><a href="<%=Url.Action(T("Edit").ToString(), "Admin", new {id = Model.Item.Id, area = "Orchard.Pages"}) %>" class="ibutton edit"><%=_Encoded("Edit")%></a></div>
<div class="metadata">
<div class="posted">Published by <%=Model.Item.Creator != null ? Html.Encode(Model.Item.Creator.UserName) : _Encoded("nobody(?)").ToString()%></div>
</div>