@activity.Name.CamelFriendly()
@activity.Description
@@ -27,7 +27,7 @@
//
'@activity.Name': {
- outcomes: [@Html.Raw(String.Join(",", activity.GetPossibleOutcomes(new WorkflowContext(), new ActivityContext()).Where(x => !String.IsNullOrEmpty(x.Text)).Select(x => "{label:'" + HttpUtility.JavaScriptStringEncode(x.Text) + "', value:'" + HttpUtility.JavaScriptStringEncode(x.TextHint) + "'}").ToArray()))],
+ outcomes: [@Html.Raw(String.Join(",", activity.GetPossibleOutcomes(new WorkflowContext(), new ActivityContext()).Where(x => !String.IsNullOrEmpty(x.Text)).Select(x => "{ Id: '" + HttpUtility.JavaScriptStringEncode(x.TextHint) + "', Label: '" + HttpUtility.JavaScriptStringEncode(x.Text) + "' }").ToArray()))],
category: '@HttpUtility.JavaScriptStringEncode(activity.Category.Text)',
description: '@HttpUtility.JavaScriptStringEncode(activity.Description.Text)',
IsEvent: @(activity.IsEvent ? "true" : "false"),
diff --git a/src/Orchard.Web/Modules/Orchard.Workflows/Views/Admin/EditProperties.cshtml b/src/Orchard.Web/Modules/Orchard.Workflows/Views/Admin/EditProperties.cshtml
new file mode 100644
index 000000000..6f7cddbd9
--- /dev/null
+++ b/src/Orchard.Web/Modules/Orchard.Workflows/Views/Admin/EditProperties.cshtml
@@ -0,0 +1,19 @@
+@model Orchard.Workflows.ViewModels.AdminEditViewModel
+@using Orchard.Workflows.Models;
+@using Orchard.Workflows.ViewModels;
+
+@using (Html.BeginFormAntiForgeryPost()) {
+ @Html.ValidationSummary()
+
+
+
+ @T("Name")
+ @Html.TextBoxFor(m => m.WorkflowDefinition.Name, new { @class = "text medium" })
+ @T("The name of the Workflow.")
+
+
+
+
+ @T("Save")
+
+}
\ No newline at end of file
diff --git a/src/Orchard.Web/Modules/Orchard.Workflows/Views/Admin/Index.cshtml b/src/Orchard.Web/Modules/Orchard.Workflows/Views/Admin/Index.cshtml
index a0de0678a..b3f94aad3 100644
--- a/src/Orchard.Web/Modules/Orchard.Workflows/Views/Admin/Index.cshtml
+++ b/src/Orchard.Web/Modules/Orchard.Workflows/Views/Admin/Index.cshtml
@@ -14,7 +14,7 @@
@Html.TitleForPage(T("Manage Workflow Definitions").ToString())
@using (Html.BeginFormAntiForgeryPost()) {
@Html.ValidationSummary()
-
@Html.ActionLink(T("Create new Workflow Definition").ToString(), "Create", new { Area = "Orchard.Workflows", returnurl = HttpContext.Current.Request.RawUrl }, new { @class = "button primaryAction" })
+
@Html.ActionLink(T("Create new Workflow Definition").Text, "EditProperties", new { Area = "Orchard.Workflows", returnurl = HttpContext.Current.Request.RawUrl }, new { @class = "button primaryAction" })
@T("Actions:")
@@ -65,9 +65,9 @@
- @* TODO: As WD is not a Content Item, an EditProperties action is necessary @Html.ActionLink(T("Properties").ToString(), "Edit", new { Area = "Contents", id = entry.WokflowDefinitionId, returnurl = HttpContext.Current.Request.RawUrl }) |*@
- @Html.ActionLink(T("Edit").ToString(), "Edit", new { id = entry.WokflowDefinitionId }) |
- @Html.ActionLink(T("Delete").ToString(), "Delete", new { id = entry.WokflowDefinitionId }, new { itemprop = "RemoveUrl UnsafeUrl" })
+ @Html.ActionLink(T("Properties").Text, "EditProperties", new { Id = entry.WokflowDefinitionId, ReturnUrl = HttpContext.Current.Request.RawUrl }) |
+ @Html.ActionLink(T("Edit").Text, "Edit", new { Id = entry.WokflowDefinitionId }) |
+ @Html.ActionLink(T("Delete").Text, "Delete", new { Id = entry.WokflowDefinitionId }, new { ItemProp = "RemoveUrl UnsafeUrl" })
index++;
diff --git a/src/Orchard.Web/Modules/Orchard.Workflows/Web.config b/src/Orchard.Web/Modules/Orchard.Workflows/Web.config
index 15a78508e..bb5061a73 100644
--- a/src/Orchard.Web/Modules/Orchard.Workflows/Web.config
+++ b/src/Orchard.Web/Modules/Orchard.Workflows/Web.config
@@ -31,6 +31,8 @@
-
+
diff --git a/src/Orchard.Web/Properties/AssemblyInfo.cs b/src/Orchard.Web/Properties/AssemblyInfo.cs
index ede1d6a99..9e413eda6 100644
--- a/src/Orchard.Web/Properties/AssemblyInfo.cs
+++ b/src/Orchard.Web/Properties/AssemblyInfo.cs
@@ -9,7 +9,7 @@ using System.Runtime.InteropServices;
[assembly: AssemblyDescription("")]
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyProduct("Orchard")]
-[assembly: AssemblyCopyright("Copyright © Outercurve Foundation 2009")]
+[assembly: AssemblyCopyright("Copyright © .NET Foundation")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]
@@ -33,6 +33,6 @@ using System.Runtime.InteropServices;
// You can specify all the values or you can default the Revision and Build Numbers
// by using the '*' as shown below:
-[assembly: AssemblyVersion("1.8.1")]
-[assembly: AssemblyFileVersion("1.8.1")]
+[assembly: AssemblyVersion("1.9.0")]
+[assembly: AssemblyFileVersion("1.9.0")]
diff --git a/src/Orchard.Web/Themes/Properties/AssemblyInfo.cs b/src/Orchard.Web/Themes/Properties/AssemblyInfo.cs
index e4825a141..e01f2312a 100644
--- a/src/Orchard.Web/Themes/Properties/AssemblyInfo.cs
+++ b/src/Orchard.Web/Themes/Properties/AssemblyInfo.cs
@@ -10,7 +10,7 @@ using System.Security;
[assembly: AssemblyDescription("")]
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyProduct("Orchard")]
-[assembly: AssemblyCopyright("Copyright © Outercurve Foundation 2009")]
+[assembly: AssemblyCopyright("Copyright © .NET Foundation")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]
@@ -34,5 +34,5 @@ using System.Security;
// You can specify all the values or you can default the Revision and Build Numbers
// by using the '*' as shown below:
-[assembly: AssemblyVersion("1.8.1")]
-[assembly: AssemblyFileVersion("1.8.1")]
+[assembly: AssemblyVersion("1.9.0")]
+[assembly: AssemblyFileVersion("1.9.0")]
diff --git a/src/Orchard.Web/Themes/SafeMode/Content/orchard.ico b/src/Orchard.Web/Themes/SafeMode/Content/orchard.ico
index 51bc8087b..055fbbb58 100644
Binary files a/src/Orchard.Web/Themes/SafeMode/Content/orchard.ico and b/src/Orchard.Web/Themes/SafeMode/Content/orchard.ico differ
diff --git a/src/Orchard.Web/Themes/SafeMode/Theme.txt b/src/Orchard.Web/Themes/SafeMode/Theme.txt
index 45ceab52f..6d68d6b90 100644
--- a/src/Orchard.Web/Themes/SafeMode/Theme.txt
+++ b/src/Orchard.Web/Themes/SafeMode/Theme.txt
@@ -1,6 +1,6 @@
Name: SafeMode
Author: Jonathan Wall
Description: The Orchard Theme for setup and failure conditions.
-Version: 1.8.1
+Version: 1.9.0
Tags: hidden
Website: http://www.orchardproject.net
diff --git a/src/Orchard.Web/Themes/TheAdmin/Scripts/admin.js b/src/Orchard.Web/Themes/TheAdmin/Scripts/admin.js
index 1d515c557..38e7407c3 100644
--- a/src/Orchard.Web/Themes/TheAdmin/Scripts/admin.js
+++ b/src/Orchard.Web/Themes/TheAdmin/Scripts/admin.js
@@ -72,7 +72,7 @@
});
$(".check-all").change(function () {
- $(this).parents("table.items").find(":checkbox:not(:disabled)").prop('checked', $(this).prop("checked"));
+ $("input[type=checkbox]:not(:disabled)").prop('checked', $(this).prop("checked"))
});
// Handle keypress events in bulk action fieldsets that are part of a single form.
diff --git a/src/Orchard.Web/Themes/TheAdmin/Theme.txt b/src/Orchard.Web/Themes/TheAdmin/Theme.txt
index 8cad73ed0..dead9ca74 100644
--- a/src/Orchard.Web/Themes/TheAdmin/Theme.txt
+++ b/src/Orchard.Web/Themes/TheAdmin/Theme.txt
@@ -1,5 +1,5 @@
Name: The Admin
-Version: 1.8.1
+Version: 1.9.0
Author: Jon Wall
Tags: hidden, admin
Description: An admin theme not to be used for the site so don't click "Activate" (or "Uninstall"). In the near future admin themes won't be mixed in with site themes.
diff --git a/src/Orchard.Web/Themes/TheAdmin/Views/User.cshtml b/src/Orchard.Web/Themes/TheAdmin/Views/User.cshtml
index a5a010b66..e0fb3fecb 100644
--- a/src/Orchard.Web/Themes/TheAdmin/Views/User.cshtml
+++ b/src/Orchard.Web/Themes/TheAdmin/Views/User.cshtml
@@ -1,2 +1,2 @@
@model dynamic
-@if (Model.CurrentUser != null) {@T("User:") @Html.ItemDisplayText((Orchard.ContentManagement.IContent)Model.CurrentUser) | @Html.ActionLink(T("Logout").ToString(), "LogOff", new { Area = "Orchard.Users", Controller = "Account", ReturnUrl = Href("~/") })
}
\ No newline at end of file
+@if (Model.CurrentUser != null) {@T("User:") @Html.ItemDisplayText((Orchard.ContentManagement.IContent)Model.CurrentUser)@T(" | ")@Html.ActionLink(T("Change password").ToString(), "ChangePassword", new { area = "Orchard.Users", Controller = "Account" })@T(" | ")@Html.ActionLink(T("Logout").ToString(), "LogOff", new { Area = "Orchard.Users", Controller = "Account", ReturnUrl = Href("~/") })
}
\ No newline at end of file
diff --git a/src/Orchard.Web/Themes/TheThemeMachine/Theme.txt b/src/Orchard.Web/Themes/TheThemeMachine/Theme.txt
index a9b724c25..3a830d43c 100644
--- a/src/Orchard.Web/Themes/TheThemeMachine/Theme.txt
+++ b/src/Orchard.Web/Themes/TheThemeMachine/Theme.txt
@@ -1,7 +1,7 @@
Name: The Theme Machine
Author: jowall, mibach, loudej, heskew
Description: Orchard Theme Machine is a flexible multi-zone theme that provides a solid foundation to build your site. It features 20 collapsible widget zones and is flexible enough to cover a wide range of layouts.
-Version: 1.8.1
+Version: 1.9.0
Tags: Awesome
Website: http://orchardproject.net
Zones: Header, Navigation, Featured, BeforeMain, AsideFirst, Messages, BeforeContent, Content, AfterContent, AsideSecond, AfterMain, TripelFirst, TripelSecond, TripelThird, FooterQuadFirst, FooterQuadSecond, FooterQuadThird, FooterQuadFourth, Footer
diff --git a/src/Orchard.Web/Themes/Themes.csproj b/src/Orchard.Web/Themes/Themes.csproj
index c9fdc1750..4ca7515ad 100644
--- a/src/Orchard.Web/Themes/Themes.csproj
+++ b/src/Orchard.Web/Themes/Themes.csproj
@@ -158,7 +158,7 @@
{2D1D92BB-4555-4CBE-8D0E-63563D6CE4C6}
Orchard.Framework
- True
+ False
diff --git a/src/Orchard.Web/Themes/Web.config b/src/Orchard.Web/Themes/Web.config
index b832147da..a037d3709 100644
--- a/src/Orchard.Web/Themes/Web.config
+++ b/src/Orchard.Web/Themes/Web.config
@@ -46,6 +46,8 @@
@@ -177,6 +177,18 @@
+
+
+
+
+
diff --git a/src/Orchard/ContentManagement/Drivers/ContentPartDriver.cs b/src/Orchard/ContentManagement/Drivers/ContentPartDriver.cs
index 9bc1affa7..aae0a6d94 100644
--- a/src/Orchard/ContentManagement/Drivers/ContentPartDriver.cs
+++ b/src/Orchard/ContentManagement/Drivers/ContentPartDriver.cs
@@ -8,6 +8,7 @@ using Orchard.ContentManagement.MetaData;
using Orchard.DisplayManagement;
using Orchard.DisplayManagement.Descriptors;
using Orchard.DisplayManagement.Shapes;
+using System.Linq;
namespace Orchard.ContentManagement.Drivers {
public abstract class ContentPartDriver : IContentPartDriver where TContent : ContentPart, new() {
@@ -58,42 +59,62 @@ namespace Orchard.ContentManagement.Drivers {
return null;
}
- // checking if the editor needs to be updated (e.g. if it was not hidden)
- var editor = Editor(part, context.New) as ContentShapeResult;
+ // checking if the editor needs to be updated (e.g. if any of the shapes were not hidden)
+ DriverResult editor = Editor(part, context.New);
+ IEnumerable contentShapeResults = GetShapeResults(editor);
+
+ if (contentShapeResults.Any(contentShapeResult => {
+ if (contentShapeResult == null) return true;
- if (editor != null) {
ShapeDescriptor descriptor;
- if (context.ShapeTable.Descriptors.TryGetValue(editor.GetShapeType(), out descriptor)) {
+ if (context.ShapeTable.Descriptors.TryGetValue(contentShapeResult.GetShapeType(), out descriptor)) {
var placementContext = new ShapePlacementContext {
Content = part.ContentItem,
ContentType = part.ContentItem.ContentType,
- Differentiator = editor.GetDifferentiator(),
+ Differentiator = contentShapeResult.GetDifferentiator(),
DisplayType = null,
Path = context.Path
};
- var location = descriptor.Placement(placementContext).Location;
+ var placementInfo = descriptor.Placement(placementContext);
+
+ var location = placementInfo.Location;
if (String.IsNullOrEmpty(location) || location == "-") {
- return editor;
+ return false;
}
- var editorGroup = editor.GetGroup() ?? "";
+ var editorGroup = contentShapeResult.GetGroup();
+ if (string.IsNullOrEmpty(editorGroup)) {
+ editorGroup = placementInfo.GetGroup() ?? "";
+ }
var contextGroup = context.GroupId ?? "";
if (!String.Equals(editorGroup, contextGroup, StringComparison.OrdinalIgnoreCase)) {
- return editor;
+ return false;
}
}
+
+ return true;
+ })) {
+ DriverResult result = Editor(part, context.Updater, context.New);
+
+ if (result != null) {
+ result.ContentPart = part;
+ }
+
+ return result;
}
- DriverResult result = Editor(part, context.Updater, context.New);
+ return editor;
+ }
- if (result != null) {
- result.ContentPart = part;
+ private static IEnumerable GetShapeResults(DriverResult driverResult) {
+ if (driverResult is CombinedResult) {
+ return ((CombinedResult)driverResult).GetResults().Select(result => result as ContentShapeResult);
}
- return result;
+ return new[] { driverResult as ContentShapeResult };
}
void IContentPartDriver.Importing(ImportContentContext context) {
diff --git a/src/Orchard/ContentManagement/Handlers/StorageFilter.cs b/src/Orchard/ContentManagement/Handlers/StorageFilter.cs
index 3c17369cd..938f918aa 100644
--- a/src/Orchard/ContentManagement/Handlers/StorageFilter.cs
+++ b/src/Orchard/ContentManagement/Handlers/StorageFilter.cs
@@ -30,7 +30,10 @@ namespace Orchard.ContentManagement.Handlers {
return _repository.Get(versionRecord.ContentItemRecord.Id);
}
- protected virtual TRecord CreateRecordCore(ContentItemVersionRecord versionRecord, TRecord record) {
+ protected virtual TRecord CreateRecordCore(ContentItemVersionRecord versionRecord, TRecord record = null) {
+ if (record == null) {
+ record = new TRecord();
+ }
record.ContentItemRecord = versionRecord.ContentItemRecord;
_repository.Create(record);
return record;
@@ -51,7 +54,7 @@ namespace Orchard.ContentManagement.Handlers {
protected override void Loading(LoadContentContext context, ContentPart instance) {
var versionRecord = context.ContentItemVersionRecord;
- instance._record.Loader(prior => GetRecordCore(versionRecord) ?? CreateRecordCore(versionRecord, prior));
+ instance._record.Loader(() => GetRecordCore(versionRecord) ?? CreateRecordCore(versionRecord));
}
protected override void Versioning(VersionContentContext context, ContentPart existing, ContentPart building) {
diff --git a/src/Orchard/ContentManagement/Handlers/StorageVersionFilter.cs b/src/Orchard/ContentManagement/Handlers/StorageVersionFilter.cs
index b7d8a0f55..740c77b52 100644
--- a/src/Orchard/ContentManagement/Handlers/StorageVersionFilter.cs
+++ b/src/Orchard/ContentManagement/Handlers/StorageVersionFilter.cs
@@ -12,7 +12,10 @@ namespace Orchard.ContentManagement.Handlers {
return _repository.Get(versionRecord.Id);
}
- protected override TRecord CreateRecordCore(ContentItemVersionRecord versionRecord, TRecord record) {
+ protected override TRecord CreateRecordCore(ContentItemVersionRecord versionRecord, TRecord record = null) {
+ if (record == null) {
+ record = new TRecord();
+ }
record.ContentItemRecord = versionRecord.ContentItemRecord;
record.ContentItemVersionRecord = versionRecord;
_repository.Create(record);
diff --git a/src/Orchard/ContentManagement/Utilities/LazyField.cs b/src/Orchard/ContentManagement/Utilities/LazyField.cs
index b03c59779..6b26f8d34 100644
--- a/src/Orchard/ContentManagement/Utilities/LazyField.cs
+++ b/src/Orchard/ContentManagement/Utilities/LazyField.cs
@@ -3,7 +3,7 @@
namespace Orchard.ContentManagement.Utilities {
public class LazyField {
private T _value;
- private Func _loader;
+ private Func _loader;
private Func _setter;
public T Value {
@@ -11,17 +11,22 @@ namespace Orchard.ContentManagement.Utilities {
set { SetValue(value); }
}
- public void Loader(Func loader) {
+ public void Loader(Func loader) {
_loader = loader;
}
+ [Obsolete]
+ public void Loader(Func loader) {
+ _loader = () => loader(_value);
+ }
+
public void Setter(Func setter) {
_setter = setter;
}
private T GetValue() {
if (_loader != null) {
- _value = _loader(_value);
+ _value = _loader();
_loader = null;
}
return _value;
diff --git a/src/Orchard/DisplayManagement/Implementation/DefaultDisplayManager.cs b/src/Orchard/DisplayManagement/Implementation/DefaultDisplayManager.cs
index 29563b9c9..967ae91de 100644
--- a/src/Orchard/DisplayManagement/Implementation/DefaultDisplayManager.cs
+++ b/src/Orchard/DisplayManagement/Implementation/DefaultDisplayManager.cs
@@ -11,6 +11,7 @@ using Orchard.DisplayManagement.Shapes;
using Orchard.Localization;
using Orchard.Logging;
using Orchard.Mvc;
+using Orchard.Mvc.Extensions;
namespace Orchard.DisplayManagement.Implementation {
public class DefaultDisplayManager : IDisplayManager {
@@ -61,7 +62,7 @@ namespace Orchard.DisplayManagement.Implementation {
return CoerceHtmlString(context.Value);
var workContext = _workContextAccessor.GetContext();
- var shapeTable = _httpContextAccessor.Current() != null
+ var shapeTable = !_httpContextAccessor.Current().IsBackgroundContext()
? _shapeTableLocator.Value.Lookup(workContext.CurrentTheme.Id)
: _shapeTableLocator.Value.Lookup(null);
diff --git a/src/Orchard/Environment/DefaultHostEnvironment.cs b/src/Orchard/Environment/DefaultHostEnvironment.cs
index 37d6e6c49..b4c388029 100644
--- a/src/Orchard/Environment/DefaultHostEnvironment.cs
+++ b/src/Orchard/Environment/DefaultHostEnvironment.cs
@@ -3,6 +3,7 @@ using System.Web;
using Orchard.Localization;
using Orchard.Logging;
using Orchard.Mvc;
+using Orchard.Mvc.Extensions;
using Orchard.Services;
using Orchard.Utility.Extensions;
@@ -41,7 +42,7 @@ namespace Orchard.Environment {
// current request can be processed correctly. So, we redirect to the same URL, so that the
// new request will come to the newly started AppDomain.
var httpContext = _httpContextAccessor.Current();
- if (httpContext != null) {
+ if (!httpContext.IsBackgroundContext()) {
// Don't redirect posts...
if (httpContext.Request.RequestType == "GET") {
httpContext.Response.Redirect(HttpContext.Current.Request.ToUrlString(), true /*endResponse*/);
diff --git a/src/Orchard/Environment/OrchardStarter.cs b/src/Orchard/Environment/OrchardStarter.cs
index 66ea2a066..3dbd599d9 100644
--- a/src/Orchard/Environment/OrchardStarter.cs
+++ b/src/Orchard/Environment/OrchardStarter.cs
@@ -63,7 +63,7 @@ namespace Orchard.Environment {
builder.RegisterType().As().SingleInstance();
builder.RegisterType().As().SingleInstance();
builder.RegisterType().As().SingleInstance();
- builder.RegisterType().As().SingleInstance();
+ builder.RegisterType().As().InstancePerDependency();
builder.RegisterType().As().SingleInstance();
builder.RegisterType().As().SingleInstance();
builder.RegisterType().As().SingleInstance();
diff --git a/src/Orchard/Environment/WorkContextAccessor.cs b/src/Orchard/Environment/WorkContextAccessor.cs
index a1216f644..af709d0d5 100644
--- a/src/Orchard/Environment/WorkContextAccessor.cs
+++ b/src/Orchard/Environment/WorkContextAccessor.cs
@@ -5,6 +5,7 @@ using System.Web;
using Autofac;
using Orchard.Logging;
using Orchard.Mvc;
+using Orchard.Mvc.Extensions;
namespace Orchard.Environment {
public class WorkContextAccessor : IWorkContextAccessor {
@@ -31,7 +32,7 @@ namespace Orchard.Environment {
public WorkContext GetContext() {
var httpContext = _httpContextAccessor.Current();
- if (httpContext != null)
+ if (!httpContext.IsBackgroundContext())
return GetContext(httpContext);
WorkContext workContext;
@@ -55,7 +56,7 @@ namespace Orchard.Environment {
public IWorkContextScope CreateWorkContextScope() {
var httpContext = _httpContextAccessor.Current();
- if (httpContext != null)
+ if (!httpContext.IsBackgroundContext())
return CreateWorkContextScope(httpContext);
var workLifetime = _lifetimeScope.BeginLifetimeScope("work");
diff --git a/src/Orchard/FileSystems/Media/FileSystemStorageProvider.cs b/src/Orchard/FileSystems/Media/FileSystemStorageProvider.cs
index dcf5a5a76..e4ad40152 100644
--- a/src/Orchard/FileSystems/Media/FileSystemStorageProvider.cs
+++ b/src/Orchard/FileSystems/Media/FileSystemStorageProvider.cs
@@ -312,10 +312,10 @@ namespace Orchard.FileSystems.Media {
/// True if success; False otherwise.
public bool TrySaveStream(string path, Stream inputStream) {
try {
- if (FileExists(path)) {
- return false;
- }
-
+ if (FileExists(path)) {
+ return false;
+ }
+
SaveStream(path, inputStream);
}
catch {
@@ -336,8 +336,6 @@ namespace Orchard.FileSystems.Media {
// The CreateFile method will map the still relative path
var file = CreateFile(path);
- inputStream.Position = 0; // We need to read from the beginning of the stream, even if it isn't at it's beginning.
-
using (var outputStream = file.OpenWrite()) {
var buffer = new byte[8192];
for (; ; ) {
@@ -348,8 +346,6 @@ namespace Orchard.FileSystems.Media {
outputStream.Write(buffer, 0, length);
}
}
-
- inputStream.Position = 0; // Rolling back the stream so external readers will have it easier.
}
///
diff --git a/src/Orchard/Localization/Services/CultureDateTimeFormatProvider.cs b/src/Orchard/Localization/Services/CultureDateTimeFormatProvider.cs
index 1ffda8e2d..5bb1c1139 100644
--- a/src/Orchard/Localization/Services/CultureDateTimeFormatProvider.cs
+++ b/src/Orchard/Localization/Services/CultureDateTimeFormatProvider.cs
@@ -177,6 +177,18 @@ namespace Orchard.Localization.Services {
return new[] { DateTimeFormat.AMDesignator, DateTimeFormat.PMDesignator };
}
}
+
+ public string GetEraName(int era) {
+ return DateTimeFormat.GetEraName(era);
+ }
+
+ public string GetShortEraName(int era) {
+ return DateTimeFormat.GetAbbreviatedEraName(era);
+ }
+
+ public int GetEra(string eraName) {
+ return DateTimeFormat.GetEra(eraName);
+ }
protected virtual DateTimeFormatInfo DateTimeFormat {
get {
@@ -230,6 +242,6 @@ namespace Orchard.Localization.Services {
return _calendarManager.GetCalendarByName(workContext.CurrentCalendar);
return CurrentCulture.Calendar;
}
- }
+ }
}
}
\ No newline at end of file
diff --git a/src/Orchard/Localization/Services/DefaultDateFormatter.cs b/src/Orchard/Localization/Services/DefaultDateFormatter.cs
index 696f1ab29..03193d2ba 100644
--- a/src/Orchard/Localization/Services/DefaultDateFormatter.cs
+++ b/src/Orchard/Localization/Services/DefaultDateFormatter.cs
@@ -110,11 +110,11 @@ namespace Orchard.Localization.Services {
int twoDigitYear, hour12, offsetHours, offsetMinutes;
bool isPm;
- string monthName, monthNameShort, monthNameGenitive, monthNameShortGenitive, dayName, dayNameShort, amPm, amPmShort, timeZone, offsetSign, fraction1Zero, fraction2Zero, fraction3Zero, fraction1Digit, fraction2Digit, fraction3Digit;
- GetDateFormatValues(parts.Date, calendar, out twoDigitYear, out monthName, out monthNameShort, out monthNameGenitive, out monthNameShortGenitive, out dayName, out dayNameShort);
+ string monthName, monthNameShort, monthNameGenitive, monthNameShortGenitive, dayName, dayNameShort, eraName, eraNameShort, amPm, amPmShort, timeZone, offsetSign, fraction1Zero, fraction2Zero, fraction3Zero, fraction1Digit, fraction2Digit, fraction3Digit;
+ GetDateFormatValues(parts.Date, calendar, out twoDigitYear, out monthName, out monthNameShort, out monthNameGenitive, out monthNameShortGenitive, out dayName, out dayNameShort, out eraName, out eraNameShort);
GetTimeFormatValues(parts.Time, out isPm, out hour12, out amPm, out amPmShort, out timeZone, out offsetSign, out offsetHours, out offsetMinutes, out fraction1Zero, out fraction2Zero, out fraction3Zero, out fraction1Digit, out fraction2Digit, out fraction3Digit);
- return String.Format(formatString, parts.Date.Year, twoDigitYear, parts.Date.Month, monthName, monthNameShort, monthNameGenitive, monthNameShortGenitive, parts.Date.Day, dayName, dayNameShort, parts.Time.Hour, hour12, parts.Time.Minute, parts.Time.Second, fraction1Zero, fraction2Zero, fraction3Zero, fraction1Digit, fraction2Digit, fraction3Digit, amPm, amPmShort, timeZone, offsetSign, offsetHours, offsetMinutes);
+ return String.Format(formatString, parts.Date.Year, twoDigitYear, parts.Date.Month, monthName, monthNameShort, monthNameGenitive, monthNameShortGenitive, parts.Date.Day, dayName, dayNameShort, eraName, eraNameShort, parts.Time.Hour, hour12, parts.Time.Minute, parts.Time.Second, fraction1Zero, fraction2Zero, fraction3Zero, fraction1Digit, fraction2Digit, fraction3Digit, amPm, amPmShort, timeZone, offsetSign, offsetHours, offsetMinutes);
}
public virtual string FormatDate(DateParts parts) {
@@ -129,10 +129,10 @@ namespace Orchard.Localization.Services {
var calendar = CurrentCalendar;
int twoDigitYear;
- string monthName, monthNameShort, monthNameGenitive, monthNameShortGenitive, dayName, dayNameShort;
- GetDateFormatValues(parts, calendar, out twoDigitYear, out monthName, out monthNameShort, out monthNameGenitive, out monthNameShortGenitive, out dayName, out dayNameShort);
+ string monthName, monthNameShort, monthNameGenitive, monthNameShortGenitive, dayName, dayNameShort, eraName, eraNameShort;
+ GetDateFormatValues(parts, calendar, out twoDigitYear, out monthName, out monthNameShort, out monthNameGenitive, out monthNameShortGenitive, out dayName, out dayNameShort, out eraName, out eraNameShort);
- return String.Format(formatString, parts.Year, twoDigitYear, parts.Month, monthName, monthNameShort, monthNameGenitive, monthNameShortGenitive, parts.Day, dayName, dayNameShort);
+ return String.Format(formatString, parts.Year, twoDigitYear, parts.Month, monthName, monthNameShort, monthNameGenitive, monthNameShortGenitive, parts.Day, dayName, dayNameShort, eraName, eraNameShort);
}
public virtual string FormatTime(TimeParts parts) {
@@ -148,7 +148,7 @@ namespace Orchard.Localization.Services {
string amPm, amPmShort, timeZone, offsetSign, fraction1Zero, fraction2Zero, fraction3Zero, fraction1Digit, fraction2Digit, fraction3Digit;
GetTimeFormatValues(parts, out isPm, out hour12, out amPm, out amPmShort, out timeZone, out offsetSign, out offsetHours, out offsetMinutes, out fraction1Zero, out fraction2Zero, out fraction3Zero, out fraction1Digit, out fraction2Digit, out fraction3Digit);
- return String.Format(formatString, null, null, null, null, null, null, null, null, null, null, parts.Hour, hour12, parts.Minute, parts.Second, fraction1Zero, fraction2Zero, fraction3Zero, fraction1Digit, fraction2Digit, fraction3Digit, amPm, amPmShort, timeZone, offsetSign, offsetHours, offsetMinutes);
+ return String.Format(formatString, null, null, null, null, null, null, null, null, null, null, null, null, parts.Hour, hour12, parts.Minute, parts.Second, fraction1Zero, fraction2Zero, fraction3Zero, fraction1Digit, fraction2Digit, fraction3Digit, amPm, amPmShort, timeZone, offsetSign, offsetHours, offsetMinutes);
}
protected virtual DateTimeParts? TryParseDateTime(string dateTimeString, string format, IDictionary replacements) {
@@ -290,7 +290,7 @@ namespace Orchard.Localization.Services {
return new TimeParts(hour, minute, second, millisecond, kind, offset);
}
- protected virtual void GetDateFormatValues(DateParts parts, Calendar calendar, out int twoDigitYear, out string monthName, out string monthNameShort, out string monthNameGenitive, out string monthNameShortGenitive, out string dayName, out string dayNameShort) {
+ protected virtual void GetDateFormatValues(DateParts parts, Calendar calendar, out int twoDigitYear, out string monthName, out string monthNameShort, out string monthNameGenitive, out string monthNameShortGenitive, out string dayName, out string dayNameShort, out string eraName, out string eraNameShort) {
var yearString = parts.Year.ToString("00", System.Globalization.CultureInfo.InvariantCulture);
twoDigitYear = Int32.Parse(yearString.Substring(yearString.Length - 2));
monthName = parts.Month > 0 ? _dateTimeFormatProvider.MonthNames[parts.Month - 1] : null;
@@ -298,7 +298,9 @@ namespace Orchard.Localization.Services {
monthNameGenitive = parts.Month > 0 ? _dateTimeFormatProvider.MonthNamesGenitive[parts.Month - 1] : null;
monthNameShortGenitive = parts.Month > 0 ? _dateTimeFormatProvider.MonthNamesShortGenitive[parts.Month - 1] : null;
dayName = parts.Day > 0 ? _dateTimeFormatProvider.DayNames[(int)calendar.GetDayOfWeek(parts.ToDateTime(calendar))] : null;
- dayNameShort = parts.Day > 0 ? _dateTimeFormatProvider.DayNamesShort[(int)calendar.GetDayOfWeek(parts.ToDateTime(calendar))] : null;
+ dayNameShort = parts.Day > 0 ? _dateTimeFormatProvider.DayNamesShort[(int)calendar.GetDayOfWeek(parts.ToDateTime(calendar))] : null;
+ eraName = parts.Day > 0 ? _dateTimeFormatProvider.GetEraName((int)calendar.GetEra(parts.ToDateTime(calendar))) : null;
+ eraNameShort = parts.Day > 0 ? _dateTimeFormatProvider.GetShortEraName((int)calendar.GetEra(parts.ToDateTime(calendar))) : null;
}
protected virtual void GetTimeFormatValues(TimeParts parts, out bool isPm, out int hour12, out string amPm, out string amPmShort, out string timeZone, out string offsetSign, out int offsetHours, out int offsetMinutes, out string fraction1Zero, out string fraction2Zero, out string fraction3Zero, out string fraction1Digit, out string fraction2Digit, out string fraction3Digit) {
@@ -349,7 +351,9 @@ namespace Orchard.Localization.Services {
{"yyyy", "(?[0-9]{4})"},
{"yyy", "(?[0-9]{3})"},
{"yy", "(?[0-9]{2})"},
- {"y", "(?[0-9]{1})"}
+ {"y", "(?[0-9]{1})"},
+ {"gg", String.Format("(?{0})", String.Format("{0}|{1}", EscapeForRegex(_dateTimeFormatProvider.GetEraName(0)), EscapeForRegex(_dateTimeFormatProvider.GetEraName(1))))},
+ {"g", String.Format("(?{0})", String.Format("{0}|{1}", EscapeForRegex(_dateTimeFormatProvider.GetEraName(0)), EscapeForRegex(_dateTimeFormatProvider.GetEraName(1))))}
};
}
@@ -404,40 +408,42 @@ namespace Orchard.Localization.Services {
{"yyyy", "{0:0000}"},
{"yyy", "{0:000}"},
{"yy", "{1:00}"},
- {"y", "{1:0}"}
+ {"y", "{1:0}"},
+ {"gg", "{10}"},
+ {"g", "{10}"}
};
}
protected virtual Dictionary GetTimeFormatReplacements() {
return new Dictionary() {
- {"HH", "{10:00}"},
- {"H", "{10:#0}"},
- {"hh", "{11:00}"},
- {"h", "{11:#0}"},
- {"mm", "{12:00}"},
- {"m", "{12:#0}"},
- {"ss", "{13:00}"},
- {"s", "{13:#0}"},
- {"fffffff", "{16}0000"},
- {"ffffff", "{16}000"},
- {"fffff", "{16}00"},
- {"ffff", "{16}0"},
- {"fff", "{16}"},
- {"ff", "{15}"},
- {"f", "{14}"},
- {"FFFFFFF", "{19}"},
- {"FFFFFF", "{19}"},
- {"FFFFF", "{19}"},
- {"FFFF", "{19}"},
- {"FFF", "{19}"},
- {"FF", "{18}"},
- {"F", "{17}"},
- {"tt", "{20}"},
- {"t", "{21}"},
- {"K", "{22}"},
- {"zzz", "{23}{24:00}:{25:00}"},
- {"zz", "{23}{24:00}"},
- {"z", "{23}{24:#0}"}
+ {"HH", "{12:00}"},
+ {"H", "{12:#0}"},
+ {"hh", "{13:00}"},
+ {"h", "{13:#0}"},
+ {"mm", "{14:00}"},
+ {"m", "{14:#0}"},
+ {"ss", "{15:00}"},
+ {"s", "{15:#0}"},
+ {"fffffff", "{18}0000"},
+ {"ffffff", "{18}000"},
+ {"fffff", "{18}00"},
+ {"ffff", "{18}0"},
+ {"fff", "{18}"},
+ {"ff", "{17}"},
+ {"f", "{16}"},
+ {"FFFFFFF", "{21}"},
+ {"FFFFFF", "{21}"},
+ {"FFFFF", "{21}"},
+ {"FFFF", "{21}"},
+ {"FFF", "{21}"},
+ {"FF", "{20}"},
+ {"F", "{19}"},
+ {"tt", "{22}"},
+ {"t", "{23}"},
+ {"K", "{24}"},
+ {"zzz", "{25}{26:00}:{27:00}"},
+ {"zz", "{25}{26:00}"},
+ {"z", "{25}{26:#0}"}
};
}
diff --git a/src/Orchard/Localization/Services/IDateTimeFormatProvider.cs b/src/Orchard/Localization/Services/IDateTimeFormatProvider.cs
index c023cf974..dabcd1473 100644
--- a/src/Orchard/Localization/Services/IDateTimeFormatProvider.cs
+++ b/src/Orchard/Localization/Services/IDateTimeFormatProvider.cs
@@ -161,6 +161,21 @@ namespace Orchard.Localization.Services {
///
string[] AmPmDesignators {
get;
- }
+ }
+
+ ///
+ /// Returns a string containing the name of the specified era.
+ ///
+ string GetEraName(int era);
+
+ ///
+ /// Returns a string containing the abbreviated name of the specified era, if an abbreviation exists.
+ ///
+ string GetShortEraName(int era);
+
+ ///
+ /// Returns the integer representing the specified era.
+ ///
+ int GetEra(string eraName);
}
}
diff --git a/src/Orchard/Mvc/Extensions/HttpContextBaseExtensions.cs b/src/Orchard/Mvc/Extensions/HttpContextBaseExtensions.cs
new file mode 100644
index 000000000..9a7864887
--- /dev/null
+++ b/src/Orchard/Mvc/Extensions/HttpContextBaseExtensions.cs
@@ -0,0 +1,9 @@
+using System.Web;
+
+namespace Orchard.Mvc.Extensions {
+ public static class HttpContextBaseExtensions {
+ public static bool IsBackgroundContext(this HttpContextBase httpContextBase) {
+ return httpContextBase == null || httpContextBase is MvcModule.HttpContextPlaceholder;
+ }
+ }
+}
diff --git a/src/Orchard/Mvc/HttpContextAccessor.cs b/src/Orchard/Mvc/HttpContextAccessor.cs
new file mode 100644
index 000000000..ffea8ca66
--- /dev/null
+++ b/src/Orchard/Mvc/HttpContextAccessor.cs
@@ -0,0 +1,18 @@
+using System.Web;
+using Autofac;
+
+namespace Orchard.Mvc {
+ public class HttpContextAccessor : IHttpContextAccessor {
+ private readonly IComponentContext _context;
+
+ public HttpContextAccessor(IComponentContext context) {
+ _context = context;
+ }
+
+ public HttpContextBase Current() {
+ HttpContextBase httpContextBase;
+ _context.TryResolve(out httpContextBase);
+ return httpContextBase;
+ }
+ }
+}
\ No newline at end of file
diff --git a/src/Orchard/Mvc/IHttpContextAccessor.cs b/src/Orchard/Mvc/IHttpContextAccessor.cs
index 91208d314..d456bce2e 100644
--- a/src/Orchard/Mvc/IHttpContextAccessor.cs
+++ b/src/Orchard/Mvc/IHttpContextAccessor.cs
@@ -1,39 +1,7 @@
-using System;
-using System.Web;
+using System.Web;
namespace Orchard.Mvc {
public interface IHttpContextAccessor {
HttpContextBase Current();
- void Set(HttpContextBase httpContext);
- }
-
- public class HttpContextAccessor : IHttpContextAccessor {
- private HttpContextBase _httpContext;
-
- public HttpContextBase Current() {
- var httpContext = GetStaticProperty();
- return httpContext != null ? new HttpContextWrapper(httpContext) : _httpContext;
- }
-
- public void Set(HttpContextBase httpContext) {
- _httpContext = httpContext;
- }
-
- private HttpContext GetStaticProperty() {
- var httpContext = HttpContext.Current;
- if (httpContext == null) {
- return null;
- }
-
- try {
- if (httpContext.Request == null) {
- return null;
- }
- }
- catch (Exception) {
- return null;
- }
- return httpContext;
- }
}
}
diff --git a/src/Orchard/Mvc/MvcModule.cs b/src/Orchard/Mvc/MvcModule.cs
index 1e0c49ce6..d6e7db059 100644
--- a/src/Orchard/Mvc/MvcModule.cs
+++ b/src/Orchard/Mvc/MvcModule.cs
@@ -85,7 +85,7 @@ namespace Orchard.Mvc {
///
/// Standin context for background tasks.
///
- class HttpContextPlaceholder : HttpContextBase {
+ public class HttpContextPlaceholder : HttpContextBase {
private readonly Lazy _baseUrl;
private readonly IDictionary _items = new Dictionary();
@@ -120,7 +120,7 @@ namespace Orchard.Mvc {
}
}
- private class HttpResponsePlaceholder : HttpResponseBase {
+ public class HttpResponsePlaceholder : HttpResponseBase {
public override string ApplyAppPathModifier(string virtualPath) {
return virtualPath;
}
@@ -135,7 +135,7 @@ namespace Orchard.Mvc {
///
/// standin context for background tasks.
///
- class HttpRequestPlaceholder : HttpRequestBase {
+ public class HttpRequestPlaceholder : HttpRequestBase {
private readonly Uri _uri;
public HttpRequestPlaceholder(Uri uri) {
@@ -217,7 +217,7 @@ namespace Orchard.Mvc {
}
}
- class HttpBrowserCapabilitiesPlaceholder : HttpBrowserCapabilitiesBase {
+ public class HttpBrowserCapabilitiesPlaceholder : HttpBrowserCapabilitiesBase {
public override string this[string key] {
get {
return "";
diff --git a/src/Orchard/Mvc/Routes/RouteExtensions.cs b/src/Orchard/Mvc/Routes/RouteExtensions.cs
deleted file mode 100644
index a55bef517..000000000
--- a/src/Orchard/Mvc/Routes/RouteExtensions.cs
+++ /dev/null
@@ -1,5 +0,0 @@
-namespace Orchard.Mvc.Routes {
- public static class RouteExtensions {
-
- }
-}
diff --git a/src/Orchard/Orchard.Framework.csproj b/src/Orchard/Orchard.Framework.csproj
index ce395e66c..c53e885c9 100644
--- a/src/Orchard/Orchard.Framework.csproj
+++ b/src/Orchard/Orchard.Framework.csproj
@@ -317,7 +317,9 @@
+ /// Generates a valid Html name.
+ ///
+ ///
+ /// Uses a white list set of chars.
+ ///
+ public static string ToHtmlName(this string name) {
+ if (String.IsNullOrWhiteSpace(name))
+ return String.Empty;
+
+ name = RemoveDiacritics(name);
+ name = name.Strip(c =>
+ c != '-'
+ && c != '_'
+ && !c.IsLetter()
+ && !Char.IsDigit(c)
+ );
+
+ name = name.Trim();
+
+ // don't allow non A-Z chars as first letter, as they are not allowed in prefixes
+ while (name.Length > 0 && !IsLetter(name[0])) {
+ name = name.Substring(1);
+ }
+
+ return name;
+ }
+
///
/// Whether the char is a letter between A and Z or not
///
diff --git a/src/Tools/MSBuild.Orchard.Tasks/Properties/AssemblyInfo.cs b/src/Tools/MSBuild.Orchard.Tasks/Properties/AssemblyInfo.cs
index e31e417e2..d80b3d68c 100644
--- a/src/Tools/MSBuild.Orchard.Tasks/Properties/AssemblyInfo.cs
+++ b/src/Tools/MSBuild.Orchard.Tasks/Properties/AssemblyInfo.cs
@@ -8,7 +8,7 @@ using System.Runtime.InteropServices;
[assembly: AssemblyDescription("")]
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyProduct("Orchard")]
-[assembly: AssemblyCopyright("Copyright © Outercurve Foundation 2009")]
+[assembly: AssemblyCopyright("Copyright © .NET Foundation")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]
@@ -30,5 +30,5 @@ using System.Runtime.InteropServices;
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
-[assembly: AssemblyVersion("1.8.1")]
-[assembly: AssemblyFileVersion("1.8.1")]
+[assembly: AssemblyVersion("1.9.0")]
+[assembly: AssemblyFileVersion("1.9.0")]
diff --git a/src/Tools/Orchard.Tests/Properties/AssemblyInfo.cs b/src/Tools/Orchard.Tests/Properties/AssemblyInfo.cs
index 223a21fe6..ef1e0f8ce 100644
--- a/src/Tools/Orchard.Tests/Properties/AssemblyInfo.cs
+++ b/src/Tools/Orchard.Tests/Properties/AssemblyInfo.cs
@@ -8,7 +8,7 @@ using System.Runtime.InteropServices;
[assembly: AssemblyDescription("")]
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyProduct("Orchard")]
-[assembly: AssemblyCopyright("Copyright © Outercurve Foundation 2009")]
+[assembly: AssemblyCopyright("Copyright © .NET Foundation")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]
@@ -30,5 +30,5 @@ using System.Runtime.InteropServices;
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
-[assembly: AssemblyVersion("1.8.1")]
-[assembly: AssemblyFileVersion("1.8.1")]
+[assembly: AssemblyVersion("1.9.0")]
+[assembly: AssemblyFileVersion("1.9.0")]
diff --git a/src/Tools/Orchard/Properties/AssemblyInfo.cs b/src/Tools/Orchard/Properties/AssemblyInfo.cs
index bc49e1d46..3f4164e83 100644
--- a/src/Tools/Orchard/Properties/AssemblyInfo.cs
+++ b/src/Tools/Orchard/Properties/AssemblyInfo.cs
@@ -8,7 +8,7 @@ using System.Runtime.InteropServices;
[assembly: AssemblyDescription("")]
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyProduct("Orchard")]
-[assembly: AssemblyCopyright("Copyright © Outercurve Foundation 2009")]
+[assembly: AssemblyCopyright("Copyright © .NET Foundation")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]
@@ -30,5 +30,5 @@ using System.Runtime.InteropServices;
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
-[assembly: AssemblyVersion("1.8.1")]
-[assembly: AssemblyFileVersion("1.8.1")]
+[assembly: AssemblyVersion("1.9.0")]
+[assembly: AssemblyFileVersion("1.9.0")]