" %>
-<%@ Import Namespace="Orchard.Comments.Models"%>
<%@ Import Namespace="Orchard.Models"%>
<%@ Import Namespace="Orchard.Blogs.Extensions"%>
<%@ Import Namespace="Orchard.Blogs.Models"%>
+ <% var postCount = Model.PostCount; %><%=string.Format("{0} post{1}", postCount, postCount == 1 ? "" : "s") %>
<%--[list of authors] [modify blog access]
--%>
<%=Model.Description %>
diff --git a/src/Orchard.Web/Packages/Orchard.Blogs/Views/Shared/DisplayTemplates/BlogPostPreviewForAdmin.ascx b/src/Orchard.Web/Packages/Orchard.Blogs/Views/Shared/DisplayTemplates/BlogPostPreviewForAdmin.ascx
index 45a4ca292..8db503cc6 100644
--- a/src/Orchard.Web/Packages/Orchard.Blogs/Views/Shared/DisplayTemplates/BlogPostPreviewForAdmin.ascx
+++ b/src/Orchard.Web/Packages/Orchard.Blogs/Views/Shared/DisplayTemplates/BlogPostPreviewForAdmin.ascx
@@ -1,5 +1,4 @@
<%@ Control Language="C#" Inherits="System.Web.Mvc.ViewUserControl" %>
-<%@ Import Namespace="Orchard.Comments.Models"%>
<%@ Import Namespace="Orchard.Models"%>
<%@ Import Namespace="Orchard.Blogs.Extensions"%>
<%@ Import Namespace="Orchard.Core.Common.Models"%>
@@ -7,7 +6,6 @@
<%=Model.Body ?? "
there's no content for this blog post
" %>
diff --git a/src/Orchard.Web/Packages/Orchard.Tags/Controllers/HomeController.cs b/src/Orchard.Web/Packages/Orchard.Tags/Controllers/HomeController.cs
index dda0f4621..9438b0d3a 100644
--- a/src/Orchard.Web/Packages/Orchard.Tags/Controllers/HomeController.cs
+++ b/src/Orchard.Web/Packages/Orchard.Tags/Controllers/HomeController.cs
@@ -6,6 +6,7 @@ using Orchard.Localization;
using Orchard.Logging;
using Orchard.Models;
using Orchard.Settings;
+using Orchard.Tags.Helpers;
using Orchard.Tags.Models;
using Orchard.Tags.Services;
using Orchard.Tags.ViewModels;
@@ -54,7 +55,7 @@ namespace Orchard.Tags.Controllers {
if (!_authorizer.Authorize(Permissions.CreateTag, T("Couldn't create tag")))
return new HttpUnauthorizedResult();
if (!String.IsNullOrEmpty(newTagName)) {
- foreach (var tagName in ParseCommaSeparatedTagNames(newTagName)) {
+ foreach (var tagName in TagHelpers.ParseCommaSeparatedTagNames(newTagName)) {
if (_tagService.GetTagByName(tagName) == null) {
_tagService.CreateTag(tagName);
}
@@ -80,7 +81,7 @@ namespace Orchard.Tags.Controllers {
try {
if (!_authorizer.Authorize(Permissions.CreateTag, T("Couldn't create tag")))
return new HttpUnauthorizedResult();
- List tagNames = ParseCommaSeparatedTagNames(tags);
+ List tagNames = TagHelpers.ParseCommaSeparatedTagNames(tags);
_tagService.UpdateTagsForContentItem(taggedContentId, tagNames);
if (!String.IsNullOrEmpty(returnUrl)) {
return Redirect(returnUrl);
@@ -96,17 +97,6 @@ namespace Orchard.Tags.Controllers {
}
}
- private static List ParseCommaSeparatedTagNames(string tags) {
- IEnumerable tagNames = tags.Split(',');
- List sanitizedTagNames = new List();
- foreach (var tagName in tagNames) {
- if (!String.IsNullOrEmpty(tagName)) {
- sanitizedTagNames.Add(tagName);
- }
- }
- return sanitizedTagNames;
- }
-
public ActionResult Search(string tagName) {
try {
Tag tag = _tagService.GetTagByName(tagName);
diff --git a/src/Orchard.Web/Packages/Orchard.Tags/Helpers/TagHelpers.cs b/src/Orchard.Web/Packages/Orchard.Tags/Helpers/TagHelpers.cs
new file mode 100644
index 000000000..9d86860c2
--- /dev/null
+++ b/src/Orchard.Web/Packages/Orchard.Tags/Helpers/TagHelpers.cs
@@ -0,0 +1,21 @@
+using System;
+using System.Collections.Generic;
+
+namespace Orchard.Tags.Helpers {
+ public class TagHelpers {
+ public static List ParseCommaSeparatedTagNames(string tags) {
+ if (String.IsNullOrEmpty(tags)) {
+ return new List();
+ }
+ IEnumerable tagNames = tags.Split(',');
+ List sanitizedTagNames = new List();
+ foreach (var tagName in tagNames) {
+ string sanitizedTagName = tagName.Trim();
+ if (!String.IsNullOrEmpty(sanitizedTagName)) {
+ sanitizedTagNames.Add(sanitizedTagName);
+ }
+ }
+ return sanitizedTagNames;
+ }
+ }
+}
\ No newline at end of file
diff --git a/src/Orchard.Web/Packages/Orchard.Tags/Models/TagsHandler.cs b/src/Orchard.Web/Packages/Orchard.Tags/Models/TagsHandler.cs
index ba2ac1841..12d553cd8 100644
--- a/src/Orchard.Web/Packages/Orchard.Tags/Models/TagsHandler.cs
+++ b/src/Orchard.Web/Packages/Orchard.Tags/Models/TagsHandler.cs
@@ -5,6 +5,7 @@ using Orchard.Data;
using Orchard.Models;
using Orchard.Models.Driver;
using Orchard.Models.ViewModels;
+using Orchard.Tags.Helpers;
using Orchard.Tags.Services;
namespace Orchard.Tags.Models {
@@ -50,7 +51,7 @@ namespace Orchard.Tags.Models {
TagsViewModel viewModel = new TagsViewModel();
context.Updater.TryUpdateModel(viewModel, String.Empty, null, null);
- List tagNames = ParseCommaSeparatedTagNames(viewModel.Tags);
+ List tagNames = TagHelpers.ParseCommaSeparatedTagNames(viewModel.Tags);
_tagService.UpdateTagsForContentItem(context.ContentItem.Id, tagNames);
context.AddEditor(new TemplateViewModel(context.ContentItem.Get()));
@@ -70,20 +71,6 @@ namespace Orchard.Tags.Models {
}
}
- private static List ParseCommaSeparatedTagNames(string tags) {
- if (String.IsNullOrEmpty(tags)) {
- return new List();
- }
- IEnumerable tagNames = tags.Split(',');
- List sanitizedTagNames = new List();
- foreach (var tagName in tagNames) {
- if (!String.IsNullOrEmpty(tagName)) {
- sanitizedTagNames.Add(tagName);
- }
- }
- return sanitizedTagNames;
- }
-
public class TagsViewModel {
public string Tags { get; set; }
}
diff --git a/src/Orchard.Web/Packages/Orchard.Tags/Orchard.Tags.csproj b/src/Orchard.Web/Packages/Orchard.Tags/Orchard.Tags.csproj
index 3726e73d8..f279f5c92 100644
--- a/src/Orchard.Web/Packages/Orchard.Tags/Orchard.Tags.csproj
+++ b/src/Orchard.Web/Packages/Orchard.Tags/Orchard.Tags.csproj
@@ -64,6 +64,7 @@
+