diff --git a/src/Orchard.Web/Modules/Orchard.Azure/Services/FileSystems/AzureFileSystem.cs b/src/Orchard.Web/Modules/Orchard.Azure/Services/FileSystems/AzureFileSystem.cs
index 170346e64..fbff62f98 100644
--- a/src/Orchard.Web/Modules/Orchard.Azure/Services/FileSystems/AzureFileSystem.cs
+++ b/src/Orchard.Web/Modules/Orchard.Azure/Services/FileSystems/AzureFileSystem.cs
@@ -67,15 +67,7 @@ namespace Orchard.Azure.Services.FileSystems {
// The container is named with DNS naming restrictions (i.e. all lower case)
_container = _blobClient.GetContainerReference(ContainerName);
- _container.CreateIfNotExists();
-
- _container.SetPermissions(_isPrivate
- ? new BlobContainerPermissions {
- PublicAccess = BlobContainerPublicAccessType.Off
- }
- : new BlobContainerPermissions {
- PublicAccess = BlobContainerPublicAccessType.Container
- });
+ _container.CreateIfNotExists(_isPrivate ? BlobContainerPublicAccessType.Off : BlobContainerPublicAccessType.Container);
}
private static string ConvertToRelativeUriPath(string path) {
diff --git a/src/Orchard.Web/Modules/Orchard.Azure/Services/FileSystems/CloudBlobContainerExtensions.cs b/src/Orchard.Web/Modules/Orchard.Azure/Services/FileSystems/CloudBlobContainerExtensions.cs
index eb12d52a9..d31932788 100644
--- a/src/Orchard.Web/Modules/Orchard.Azure/Services/FileSystems/CloudBlobContainerExtensions.cs
+++ b/src/Orchard.Web/Modules/Orchard.Azure/Services/FileSystems/CloudBlobContainerExtensions.cs
@@ -10,15 +10,7 @@ namespace Orchard.Azure.Services.FileSystems {
public static bool BlobExists(this CloudBlobContainer container, string path) {
if (String.IsNullOrEmpty(path) || path.Trim() == String.Empty)
throw new ArgumentException("Path can't be empty");
-
- try {
- var blob = container.GetBlockBlobReference(path);
- blob.FetchAttributes();
- return true;
- }
- catch (StorageException) {
- return false;
- }
+ return container.GetBlockBlobReference(path).Exists();
}
public static void EnsureBlobExists(this CloudBlobContainer container, string path) {
diff --git a/src/Orchard.Web/Modules/Orchard.Azure/Services/TaskLease/AzureMachineNameProvider.cs b/src/Orchard.Web/Modules/Orchard.Azure/Services/TaskLease/AzureMachineNameProvider.cs
new file mode 100644
index 000000000..57d260bc8
--- /dev/null
+++ b/src/Orchard.Web/Modules/Orchard.Azure/Services/TaskLease/AzureMachineNameProvider.cs
@@ -0,0 +1,16 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using Microsoft.WindowsAzure.ServiceRuntime;
+using Orchard.TaskLease.Services;
+
+namespace Orchard.Azure.Services.TaskLease
+{
+ public class AzureMachineNameProvider : IMachineNameProvider
+ {
+ public string GetMachineName()
+ {
+ return RoleEnvironment.CurrentRoleInstance.Id;
+ }
+ }
+}
\ No newline at end of file
diff --git a/src/Orchard.Web/Modules/Orchard.CodeGeneration/Commands/CodeGenerationCommands.cs b/src/Orchard.Web/Modules/Orchard.CodeGeneration/Commands/CodeGenerationCommands.cs
index 2c9d1e52e..de6a306a7 100644
--- a/src/Orchard.Web/Modules/Orchard.CodeGeneration/Commands/CodeGenerationCommands.cs
+++ b/src/Orchard.Web/Modules/Orchard.CodeGeneration/Commands/CodeGenerationCommands.cs
@@ -21,10 +21,10 @@ namespace Orchard.CodeGeneration.Commands {
private const string SolutionDirectoryThemes = "74492CBC-7201-417E-BC29-28B4C25A58B0";
private static readonly string[] _themeDirectories = new[] {
- "", "Content", "Styles", "Scripts", "Views", "Zones"
+ "", "Content", "Styles", "Scripts", "Views"
};
private static readonly string[] _moduleDirectories = new[] {
- "", "Properties", "Controllers", "Views", "Models", "Scripts", "Styles"
+ "", "Properties", "Controllers", "Views", "Models", "Scripts", "Styles"
};
private static readonly string[] _moduleTestsDirectories = new[] {
"", "Properties"
diff --git a/src/Orchard.Web/Modules/Orchard.Comments/Controllers/CommentController.cs b/src/Orchard.Web/Modules/Orchard.Comments/Controllers/CommentController.cs
index 38c4fec44..56ff22f49 100644
--- a/src/Orchard.Web/Modules/Orchard.Comments/Controllers/CommentController.cs
+++ b/src/Orchard.Web/Modules/Orchard.Comments/Controllers/CommentController.cs
@@ -35,19 +35,19 @@ namespace Orchard.Comments.Controllers {
var editorShape = Services.ContentManager.UpdateEditor(comment, this);
- if (!ModelState.IsValidField("Author")) {
+ if (!ModelState.IsValidField("Comments.Author")) {
Services.Notifier.Error(T("Name is mandatory and must have less than 255 chars"));
}
- if (!ModelState.IsValidField("Email")) {
+ if (!ModelState.IsValidField("Comments.Email")) {
Services.Notifier.Error(T("Email is invalid or is longer than 255 chars"));
}
- if (!ModelState.IsValidField("Site")) {
+ if (!ModelState.IsValidField("Comments.Site")) {
Services.Notifier.Error(T("Site url is invalid or is longer than 255 chars"));
}
- if (!ModelState.IsValidField("CommentText")) {
+ if (!ModelState.IsValidField("Comments.CommentText")) {
Services.Notifier.Error(T("Comment is mandatory"));
}
diff --git a/src/Orchard.Web/Modules/Orchard.ContentPermissions/Drivers/ContentPermissionsPartDriver.cs b/src/Orchard.Web/Modules/Orchard.ContentPermissions/Drivers/ContentPermissionsPartDriver.cs
index a294aef02..5e3fcf9af 100644
--- a/src/Orchard.Web/Modules/Orchard.ContentPermissions/Drivers/ContentPermissionsPartDriver.cs
+++ b/src/Orchard.Web/Modules/Orchard.ContentPermissions/Drivers/ContentPermissionsPartDriver.cs
@@ -177,7 +177,7 @@ namespace Orchard.ContentPermissions.Drivers {
}
if (!_authorizer.Authorize(Core.Contents.Permissions.PublishOwnContent, part.ContentItem)) {
- part.PublishOwnContent = settings == null ? ContentPermissionsPartViewModel.SerializePermissions(allRoles.Select(x => new RoleEntry {Role = x, Checked = _authorizationService.TryCheckAccess(Core.Contents.Permissions.ViewContent, UserSimulation.Create(x), null)})) : settings.PublishOwn;
+ part.PublishOwnContent = settings == null ? ContentPermissionsPartViewModel.SerializePermissions(allRoles.Select(x => new RoleEntry {Role = x, Checked = _authorizationService.TryCheckAccess(Core.Contents.Permissions.PublishOwnContent, UserSimulation.Create(x), null)})) : settings.PublishOwn;
}
if (!_authorizer.Authorize(Core.Contents.Permissions.EditContent, part.ContentItem)) {
diff --git a/src/Orchard.Web/Modules/Orchard.ContentPermissions/Views/DefinitionTemplates/ContentPermissionsPartViewModel.cshtml b/src/Orchard.Web/Modules/Orchard.ContentPermissions/Views/DefinitionTemplates/ContentPermissionsPartViewModel.cshtml
index 889859042..b318e1c74 100644
--- a/src/Orchard.Web/Modules/Orchard.ContentPermissions/Views/DefinitionTemplates/ContentPermissionsPartViewModel.cshtml
+++ b/src/Orchard.Web/Modules/Orchard.ContentPermissions/Views/DefinitionTemplates/ContentPermissionsPartViewModel.cshtml
@@ -28,13 +28,6 @@
@Html.HiddenFor(m => m.ViewRoles[role.Index].Role)
- |
-
- @Html.HiddenFor(m => m.PublishRoles[role.Index].Role)
- |
@Html.HiddenFor(m => m.EditRoles[role.Index].Role)
|
+
+
+ @Html.HiddenFor(m => m.PublishRoles[role.Index].Role)
+ |
@Html.HiddenFor(m => m.ViewOwnRoles[role.Index].Role)
|
-
-
- @Html.HiddenFor(m => m.PublishOwnRoles[role.Index].Role)
- |
@Html.HiddenFor(m => m.EditOwnRoles[role.Index].Role)
|
+
+
+ @Html.HiddenFor(m => m.PublishOwnRoles[role.Index].Role)
+ |
|