Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Adjust content type condition to evaluate to true when no content is displayed #15603

Merged
merged 4 commits into from
Mar 28, 2024
Merged

Adjust content type condition to evaluate to true when no content is displayed #15603

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
cdbad77
Adjust content type condition to evaluate to true when no content is …
rwawr Mar 27, 2024
ba17907
Adjust logic to compare condition value to empty string rather than a…
rwawr Mar 27, 2024
f82a6ab
Apply suggestions from code review
rwawr Mar 28, 2024
c8376e0
Merge branch 'main' into fix-content-type-condition
MikeAlhayek Mar 28, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions src/OrchardCore.Modules/OrchardCore.Rules/Drivers/ContentTypeConditionEvaluatorDriver.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,14 @@ public ValueTask<bool> EvaluateAsync(Condition condition)
private ValueTask<bool> EvaluateAsync(ContentTypeCondition condition)
{
var operatorComparer = _operatorResolver.GetOperatorComparer(condition.Operation);

// If no content types are considered, use the empty string as the value to compare against,
// since we still want comparisons such as "Does Not Equal", "Does Not Start With", etc. to evaluate to true in this case.
if (_contentTypes.Count == 0)
{
return ValueTask.FromResult(operatorComparer.Compare(condition.Operation, string.Empty, condition.Value));
}

foreach (var contentType in _contentTypes)
{
if (operatorComparer.Compare(condition.Operation, contentType, condition.Value))
Expand Down
Loading