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.

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

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

Merged
merged 6 commits into from May 21, 2019

Conversation

Projects
None yet
4 participants
@domonkosgabor
Copy link
Contributor

commented May 15, 2019

No description provided.

@domonkosgabor domonkosgabor self-assigned this May 15, 2019

@sebastienros

This comment has been minimized.

Copy link
Member

commented May 16, 2019

LGTM

@BenedekFarkas
Copy link
Member

left a comment

@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 some commits May 21, 2019

Merge remote-tracking branch 'origin/dev' into issue/ORCH-199
# Conflicts:
#	src/Orchard.Web/Modules/Orchard.Projections/Orchard.Projections.csproj
Merge branch 'dev' into issue/ORCH-199
# Conflicts:
#	src/Orchard.Web/Modules/Orchard.Projections/Orchard.Projections.csproj

@BenedekFarkas BenedekFarkas merged commit ce63f47 into OrchardCMS:dev May 21, 2019

1 check passed

license/cla All CLA requirements met.
Details

@BenedekFarkas BenedekFarkas deleted the Lombiq:issue/ORCH-199 branch May 21, 2019

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.