diff --git a/.hgsubstate b/.hgsubstate index 32e0360cb..148e5184d 100644 --- a/.hgsubstate +++ b/.hgsubstate @@ -1,5 +1,5 @@ d0cf85644ff34b0630a12eed746a66a8d88eb5cf src/Orchard.Web/Modules/Orchard.Forms -8413a416e232ac2c90520de8ff07622ba30561db src/Orchard.Web/Modules/Orchard.Projections -3d11da7572a1107aad47b8a9eb4dbb1e7553b18b src/Orchard.Web/Modules/Orchard.Rules +b571876d276f9022c12b8b464d5e138f5ce06c14 src/Orchard.Web/Modules/Orchard.Projections +108ae2f95c8bf9bf0d4d06d0e31b5b77f855cba3 src/Orchard.Web/Modules/Orchard.Rules 65057c6a5cd71f7994ba9bcbeece50dbb737620e src/Orchard.Web/Modules/Orchard.TaskLease 9496e39d3bab7655114d8dfc75290954856ec567 src/Orchard.Web/Modules/Orchard.Tokens diff --git a/src/Orchard.Web/Modules/Orchard.Tags/Module.txt b/src/Orchard.Web/Modules/Orchard.Tags/Module.txt index 62cf79b30..0cfc09978 100644 --- a/src/Orchard.Web/Modules/Orchard.Tags/Module.txt +++ b/src/Orchard.Web/Modules/Orchard.Tags/Module.txt @@ -4,7 +4,14 @@ Author: The Orchard Team Website: http://orchardproject.net Version: 1.3.0 OrchardVersion: 1.3.0 -Description: The tags module is providing basic tagging for arbitrary content types. -FeatureDescription: Tag a content item. -Dependencies: Settings -Category: Navigation +Features: + Orchard.Tags: + Name: Tags + Description: The tags module is providing basic tagging for arbitrary content types. + Dependencies: Settings + Category: Navigation + Orchard.Tags.Projections: + Name: Tags Projections + Description: Projections for the Tags module + Category: Projections + Dependencies: Orchard.Tags, Orchard.Projections diff --git a/src/Orchard.Web/Modules/Orchard.Tags/Orchard.Tags.csproj b/src/Orchard.Web/Modules/Orchard.Tags/Orchard.Tags.csproj index 32dc1086b..c739ed5f1 100644 --- a/src/Orchard.Web/Modules/Orchard.Tags/Orchard.Tags.csproj +++ b/src/Orchard.Web/Modules/Orchard.Tags/Orchard.Tags.csproj @@ -18,6 +18,7 @@ 3.5 + false true @@ -56,6 +57,7 @@ + diff --git a/src/Orchard/ContentManagement/DefaultContentQuery.cs b/src/Orchard/ContentManagement/DefaultContentQuery.cs index a77a8b7b8..fbb56f70e 100644 --- a/src/Orchard/ContentManagement/DefaultContentQuery.cs +++ b/src/Orchard/ContentManagement/DefaultContentQuery.cs @@ -283,6 +283,11 @@ namespace Orchard.ContentManagement { return this; } + public IExpressionFactory WithRelationship(string path) { + Criteria = _query.BindCriteriaByPath(Criteria, path); + return this; + } + public IExpressionFactory WithVersionRecord(string path) { Criteria = _query.BindCriteriaByPath(_query.BindItemVersionCriteria(), path); return this; diff --git a/src/Orchard/ContentManagement/IExpressionFactory.cs b/src/Orchard/ContentManagement/IExpressionFactory.cs index 53fc01d7a..850c6ec4f 100644 --- a/src/Orchard/ContentManagement/IExpressionFactory.cs +++ b/src/Orchard/ContentManagement/IExpressionFactory.cs @@ -6,6 +6,7 @@ namespace Orchard.ContentManagement { public interface IExpressionFactory { IExpressionFactory WithRecord(string recordName); IExpressionFactory WithVersionRecord(string recordName); + IExpressionFactory WithRelationship(string propertyName); void Eq(string propertyName, object value); void Like(string propertyName, object value);