mirror of
https://github.com/OrchardCMS/Orchard.git
synced 2025-10-15 19:54:57 +08:00
Merge default => dev
--HG-- branch : dev
This commit is contained in:
@@ -4,7 +4,7 @@ Author: The Orchard Team
|
||||
Website: http://orchardproject.net
|
||||
Version: 0.8.0
|
||||
OrchardVersion: 0.8.0
|
||||
Description: The ArhiveLater module introduces scheduled archiving functionality.
|
||||
Description: The ArchiveLater module introduces scheduled archiving functionality.
|
||||
Features:
|
||||
Orchard.ArchiveLater:
|
||||
Name: Archive Later
|
||||
|
@@ -1,4 +1,5 @@
|
||||
using System.Linq;
|
||||
using System.Reflection;
|
||||
using System.Web.Mvc;
|
||||
using Orchard.Blogs.Extensions;
|
||||
using Orchard.Blogs.Models;
|
||||
@@ -54,7 +55,7 @@ namespace Orchard.Blogs.Controllers {
|
||||
if (!Services.Authorizer.Authorize(Permissions.ManageBlogs, T("Not allowed to create blogs")))
|
||||
return new HttpUnauthorizedResult();
|
||||
|
||||
var blog = Services.ContentManager.New<BlogPart>("Blog");
|
||||
BlogPart blog = Services.ContentManager.New<BlogPart>("Blog");
|
||||
if (blog == null)
|
||||
return HttpNotFound();
|
||||
|
||||
|
@@ -95,5 +95,6 @@ namespace Orchard.Blogs.Controllers {
|
||||
// Casting to avoid invalid (under medium trust) reflection over the protected View method and force a static invocation.
|
||||
return View((object)blog);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
@@ -1,4 +1,4 @@
|
||||
Name: Code generation
|
||||
Name: Code Generation
|
||||
AntiForgery: enabled
|
||||
Author: The Orchard Team
|
||||
Website: http://orchardproject.net
|
||||
|
@@ -4,7 +4,7 @@ using Orchard.Security.Permissions;
|
||||
|
||||
namespace Orchard.Roles.ViewModels {
|
||||
public class RoleCreateViewModel {
|
||||
[Required]
|
||||
[Required, StringLength(255)]
|
||||
public string Name { get; set; }
|
||||
public IDictionary<string, IEnumerable<Permission>> FeaturePermissions { get; set; }
|
||||
}
|
||||
|
@@ -5,7 +5,7 @@ using Orchard.Security.Permissions;
|
||||
namespace Orchard.Roles.ViewModels {
|
||||
public class RoleEditViewModel {
|
||||
public int Id { get; set; }
|
||||
[Required]
|
||||
[Required, StringLength(255)]
|
||||
public string Name { get; set; }
|
||||
public IDictionary<string, IEnumerable<Permission>> RoleCategoryPermissions { get; set; }
|
||||
public IEnumerable<string> CurrentPermissions { get; set; }
|
||||
|
Reference in New Issue
Block a user