lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2025-10-15 19:54:57 +08:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Fixing clayless issues with Projections

Browse Source 
--HG--
branch : 1.x
This commit is contained in:
Sebastien Ros
2013-02-04 11:33:22 -08:00
parent fca554ddc9
commit 2dfca7a776
6 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/Orchard.Web/Modules/Orchard.Forms/Services/FormParametersHelper.cs
View File

@@ -5,7 +5,6 @@ using System.Xml;
using System.Xml.Linq;
using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
using Orchard.Data.Bags;
namespace Orchard.Forms.Services {
public static class FormParametersHelper {

2
src/Orchard.Web/Modules/Orchard.Forms/Shapes/EditorShapes.cs
View File

@@ -350,7 +350,7 @@ namespace Orchard.Forms.Shapes {
Output.WriteLine(select.ToString(TagRenderMode.StartTag));
string selectedValue = Convert.ToString(Shape.Value);
string selectedValue = Convert.ToString(Shape.Value) ?? "";
var selectedValues = selectedValue.Split(new[] { ',' });
foreach (var item in Items) {

2
src/Orchard.Web/Modules/Orchard.Forms/Shapes/PropertyItemsBehavior.cs
View File

@@ -4,7 +4,7 @@ using Orchard.DisplayManagement;
using Orchard.DisplayManagement.Shapes;
namespace Orchard.Forms.Shapes {
public class PropertiesAreItems : Composite {
public class PropertiesAreItems : Shape {
public override bool TrySetMember(System.Dynamic.SetMemberBinder binder, object value) {
Patch(this, binder.Name, value);
return base.TrySetMember(binder, value);

4
src/Orchard.Web/Modules/Orchard.Projections/Providers/SortCriteria/MemberBindingSortCriteria.cs
View File

@@ -42,14 +42,14 @@ namespace Orchard.Projections.Providers.SortCriteria {
public void ApplyFilter(SortCriterionContext context, PropertyInfo property) {
bool ascending = Convert.ToBoolean(context.State.Sort);
bool ascending = Boolean.Parse(Convert.ToString(context.State.Sort));
context.Query = ascending
? context.Query.OrderBy(alias => alias.ContentPartRecord(property.DeclaringType), x => x.Asc(property.Name))
: context.Query.OrderBy(alias => alias.ContentPartRecord(property.DeclaringType), x => x.Desc(property.Name));
}
public LocalizedString DisplaySortCriterion(SortCriterionContext context, string propertyName) {
bool ascending = Convert.ToBoolean(context.State.Sort);
bool ascending = Boolean.Parse(Convert.ToString(context.State.Sort));
if (ascending) {
return T("Ordered by {0}, ascending", propertyName);

2
src/Orchard.Web/Web.config
View File

@@ -52,7 +52,7 @@
affects performance, set this value to true only
during development.
-->
<compilation debug="false" targetFramework="4.0" batch="true" numRecompilesBeforeAppRestart="250" optimizeCompilations="true">
<compilation debug="true" targetFramework="4.0" batch="true" numRecompilesBeforeAppRestart="250" optimizeCompilations="true">
<buildProviders>
<add extension=".csproj" type="Orchard.Environment.Extensions.Compilers.CSharpExtensionBuildProviderShim"/>
</buildProviders>

1
src/Orchard/Orchard.Framework.csproj
View File

@@ -169,6 +169,7 @@
<Compile Include="ContentManagement\MetaData\Services\ISettingsFormatter.cs" />
<Compile Include="ContentManagement\QueryHints.cs" />
<Compile Include="ContentManagement\Utilities\ComputedField.cs" />
<Compile Include="Data\Bags\SArray.cs" />
<Compile Include="DisplayManagement\Arguments.cs" />
<Compile Include="Data\Bags\SConvert.cs" />
<Compile Include="Data\Bags\Serialization\IBagSerializer.cs" />