Skip to content

Commit 2dc2f52

Browse files
committed
TD-5496
1 parent 5b9eeb2 commit 2dc2f52

File tree

3 files changed

+9
-5
lines changed

3 files changed

+9
-5
lines changed

LearningHub.Nhs.WebUI/Controllers/HomeController.cs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -274,6 +274,10 @@ public async Task<IActionResult> LoadPage(string dashBoardTray = "my-learning",
274274
Catalogues = new Nhs.Models.Dashboard.DashboardCatalogueResponseViewModel { Type = catalogueDashBoard },
275275
};
276276

277+
var enableMoodle = Task.Run(() => this.featureManager.IsEnabledAsync(FeatureFlags.EnableMoodle)).Result;
278+
this.ViewBag.EnableMoodle = enableMoodle;
279+
this.ViewBag.ValidMoodleUser = this.CurrentMoodleUserId > 0;
280+
277281
bool isAjax = this.HttpContext.Request.Headers["X-Requested-With"] == "XMLHttpRequest";
278282

279283
if (isAjax)

OpenAPI/LearningHub.Nhs.OpenApi/LearningHub.NHS.OpenAPI.csproj

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<Project Sdk="Microsoft.NET.Sdk.Web">
1+
<Project Sdk="Microsoft.NET.Sdk.Web">
22

33
<PropertyGroup>
44
<Nullable>enable</Nullable>
@@ -21,6 +21,7 @@
2121
<PackageReference Include="Microsoft.ApplicationInsights.AspNetCore" Version="2.22.0" />
2222
<PackageReference Include="Microsoft.ApplicationInsights.NLogTarget" Version="2.22.0" />
2323
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="6.0.36" />
24+
<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="6.0.36" />
2425
<PackageReference Include="NLog.Web.AspNetCore" Version="4.15.0" />
2526
<PackageReference Include="StyleCop.Analyzers" Version="1.1.118">
2627
<PrivateAssets>all</PrivateAssets>

OpenAPI/LearningHub.Nhs.OpenApi/Startup.cs

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -90,12 +90,11 @@ public void ConfigureServices(IServiceCollection services)
9090
{
9191
options.Filters.Add(new HttpResponseExceptionFilter());
9292
options.Filters.Add(new AuthorizeFilter());
93-
})
94-
.AddJsonOptions(options =>
95-
{
96-
options.JsonSerializerOptions.ReferenceHandler = System.Text.Json.Serialization.ReferenceHandler.IgnoreCycles;
9793
});
9894

95+
services.AddMvc()
96+
.AddNewtonsoftJson(options => options.SerializerSettings.ReferenceLoopHandling = Newtonsoft.Json.ReferenceLoopHandling.Ignore);
97+
9998
services.AddSwaggerGen(
10099
c =>
101100
{

0 commit comments

Comments
 (0)