Skip to content

Merge DraftFieldIndexService.cs into FieldIndexService.cs #7925 (Lombiq Technologies: ORCH-199)#8205

Merged
BenedekFarkas merged 6 commits into
OrchardCMS:devfrom
Lombiq:issue/ORCH-199
May 21, 2019
Merged

Merge DraftFieldIndexService.cs into FieldIndexService.cs #7925 (Lombiq Technologies: ORCH-199)#8205
BenedekFarkas merged 6 commits into
OrchardCMS:devfrom
Lombiq:issue/ORCH-199

Conversation

@domonkosgabor

Copy link
Copy Markdown
Contributor

No description provided.

@domonkosgabor domonkosgabor self-assigned this May 15, 2019
@sebastienros

Copy link
Copy Markdown
Member

LGTM

@BenedekFarkas BenedekFarkas left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@domonkosgabor please make the following changes:

  1. Change the if-else structures to switch-case in FieldIndexService. Since FieldIndexRecordVersionOptions is an enum, we could support further values (for example QueryVersionScope supports Draft-only too).
  2. Simplify the return statements, as they duplicate a lot of code between the case execution paths.
  3. Also apply any code lens recommendations (e.g. "string" instead of "String"), including C# 7 language features.
  4. Resolve the merge conflict.

domonkosgabor and others added 5 commits May 21, 2019 12:50
# Conflicts:
#	src/Orchard.Web/Modules/Orchard.Projections/Orchard.Projections.csproj
# Conflicts:
#	src/Orchard.Web/Modules/Orchard.Projections/Orchard.Projections.csproj
@BenedekFarkas
BenedekFarkas merged commit ce63f47 into OrchardCMS:dev May 21, 2019
@BenedekFarkas
BenedekFarkas deleted the issue/ORCH-199 branch May 21, 2019 18:05
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants