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

Few missing language types in .cs #14323

Merged
merged 2 commits into from
Sep 13, 2023
Merged

Few missing language types in .cs #14323

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
69c4402
Missing language types in .cs
jtkech Sep 13, 2023
27d6417
Revert unrelated change
jtkech Sep 13, 2023
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
2 changes: 1 addition & 1 deletion src/OrchardCore.Modules/OrchardCore.Facebook/Filters/FBInitFilter.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ public async Task OnResultExecutionAsync(ResultExecutingContext context, ResultE
{
var site = (await _siteService.GetSiteSettingsAsync());
var settings = site.As<FacebookSettings>();
if (!String.IsNullOrWhiteSpace(settings?.AppId))
if (!string.IsNullOrWhiteSpace(settings?.AppId))
{
if (settings.FBInit)
{
Expand Down
4 changes: 2 additions & 2 deletions src/OrchardCore.Modules/OrchardCore.Workflows/Http/Filters/WorkflowActionFilter.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,13 +44,13 @@ public async Task OnActionExecutionAsync(ActionExecutingContext context, ActionE

if (workflowTypeEntries.Any())
{
var workflowTypeIds = workflowTypeEntries.Select(x => Int64.Parse(x.WorkflowId)).ToList();
var workflowTypeIds = workflowTypeEntries.Select(x => long.Parse(x.WorkflowId)).ToList();
var workflowTypes = (await _workflowTypeStore.GetAsync(workflowTypeIds)).ToDictionary(x => x.Id);
var correlationId = routeValues.GetValue<string>("correlationid");

foreach (var entry in workflowTypeEntries)
{
if (workflowTypes.TryGetValue(Int64.Parse(entry.WorkflowId), out var workflowType))
if (workflowTypes.TryGetValue(long.Parse(entry.WorkflowId), out var workflowType))
{
var activity = workflowType.Activities.Single(x => x.ActivityId == entry.ActivityId);

Expand Down
2 changes: 1 addition & 1 deletion src/OrchardCore.Modules/OrchardCore.Workflows/Http/Services/WorkflowInstanceRouteEntries.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ internal static IEnumerable<WorkflowRoutesEntry> GetWorkflowRoutesEntries(Workfl
var activity = activityLibrary.InstantiateActivity<HttpRequestFilterEvent>(x);
var entry = new WorkflowRoutesEntry
{
WorkflowId = workflow.WorkflowId,
WorkflowId = workflow.Id.ToString(),
Copy link
Member

Choose a reason for hiding this comment

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

Why this change?

Copy link
Member Author

Choose a reason for hiding this comment

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

This is an old mistake, it couldn't work as somewhere else it is doing a long.Parse() on it. But WorkflowId is not a long, this is Id which is a long.

Here in GetWorkflowRoutesEntries() I did the same as in GetWorkflowTypeRoutesEntries().

Copy link
Member

Choose a reason for hiding this comment

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

Not sure I follow you. You know better. But maybe fix that is a separate PR

Copy link
Member Author

Choose a reason for hiding this comment

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

Okay will remove asap

Copy link
Member Author

Choose a reason for hiding this comment

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

Done

ActivityId = x.ActivityId,
HttpMethod = activity.HttpMethod,
RouteValues = activity.RouteValues,
Expand Down
2 changes: 1 addition & 1 deletion src/OrchardCore/OrchardCore.ResourceManagement.Abstractions/RequireSettings.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ public RequireSettings AtLocation(ResourceLocation location)
[MethodImpl(MethodImplOptions.AggressiveInlining)]
public RequireSettings UseCulture(string cultureName)
{
if (!String.IsNullOrEmpty(cultureName))
if (!string.IsNullOrEmpty(cultureName))
{
Culture = cultureName;
}
Expand Down
4 changes: 2 additions & 2 deletions ...ates/content/OrchardCore.Templates.Cms.Module/Settings/MyTestPartSettingsDisplayDriver.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ public class MyTestPartSettingsDisplayDriver : ContentTypePartDefinitionDisplayD
{
public override IDisplayResult Edit(ContentTypePartDefinition contentTypePartDefinition, IUpdateModel updater)
{
if (!String.Equals(nameof(MyTestPart), contentTypePartDefinition.PartDefinition.Name))
if (!string.Equals(nameof(MyTestPart), contentTypePartDefinition.PartDefinition.Name))
{
return null;
}
Expand All @@ -28,7 +28,7 @@ public override IDisplayResult Edit(ContentTypePartDefinition contentTypePartDef

public override async Task<IDisplayResult> UpdateAsync(ContentTypePartDefinition contentTypePartDefinition, UpdateTypePartEditorContext context)
{
if (!String.Equals(nameof(MyTestPart), contentTypePartDefinition.PartDefinition.Name))
if (!string.Equals(nameof(MyTestPart), contentTypePartDefinition.PartDefinition.Name))
{
return null;
}
Expand Down
2 changes: 1 addition & 1 deletion test/OrchardCore.Abstractions.Tests/Modules/Manifest/FeatureAttributeTests.Attribute.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -245,7 +245,7 @@ protected readonly struct RenderKeyValuePair
/// </summary>
/// <param name="_"></param>
/// <returns></returns>
/// <remarks>Given value may be Null, Nullable, Sring, or Boolean. Otherwise,
/// <remarks>Given value may be Null, Nullable, String, or Boolean. Otherwise,
/// makes a best effort to convert directly to string.</remarks>
private static string DefaultRender(object _)
{
Expand Down