Skip to content

Commit ffb5438

Browse files
ArunimaGeorgeArunimaGeorge
committed
Merging changes from RC to Messaging Service
2 parents ae4f434 + 1a86b09 commit ffb5438

File tree

139 files changed

+4346
-819
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

139 files changed

+4346
-819
lines changed

‎AdminUI/LearningHub.Nhs.AdminUI/Controllers/UserGroupController.cs‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -197,7 +197,15 @@ public async Task<IActionResult> Details(UserGroupAdminDetailViewModel userGroup
197197
if (userGroup.IsNew())
198198
{
199199
validationResult = await this.userGroupService.CreateUserGroup(userGroup);
200-
userGroup = await this.userGroupService.GetUserGroupAdminDetailbyIdAsync(validationResult.CreatedId.Value);
200+
if (validationResult.IsValid)
201+
{
202+
userGroup = await this.userGroupService.GetUserGroupAdminDetailbyIdAsync(validationResult.CreatedId.Value);
203+
}
204+
else
205+
{
206+
this.ViewBag.ErrorMessage = $"Update failed: {string.Join(Environment.NewLine, validationResult.Details)}";
207+
return this.View("Details", userGroup);
208+
}
201209
}
202210
else
203211
{

‎AdminUI/LearningHub.Nhs.AdminUI/Controllers/api/UserController.cs‎

Lines changed: 0 additions & 60 deletions
This file was deleted.

‎AdminUI/LearningHub.Nhs.AdminUI/Scripts/vuesrc/ckeditorwithhint.vue‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<template>
22
<div>
3-
<ckeditor v-model="description" :config="editorConfig" @ready="onEditorReady" @blur="onBlur"></ckeditor>
3+
<ckeditor class="nhsuk-textarea" v-model="description" :config="editorConfig" @ready="onEditorReady" @blur="onBlur"></ckeditor>
44
<div :class="[`pt-2 footer-text${this.valid ? '' : ' text-danger'}`]">{{ hint }}</div>
55
</div>
66
</template>

‎AdminUI/LearningHub.Nhs.AdminUI/Views/Catalogue/CatalogueOwner.cshtml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,14 +47,14 @@
4747
<div class="row mt-5">
4848
<div class="col-12">
4949
<label>Catalogue owner email address</label>
50-
<input asp-for="OwnerEmailAddress" class="form-control" maxlength="250" />
50+
<input asp-for="OwnerEmailAddress" class="form-control nhsuk-input" maxlength="250" />
5151
<span asp-validation-for="OwnerEmailAddress"></span>
5252
</div>
5353
</div>
5454
<div class="row mt-5">
5555
<div class="col-12">
5656
<label>Notes</label>
57-
<textarea asp-for="Notes" class="form-control"></textarea>
57+
<textarea asp-for="Notes" class="form-control nhsuk-input"></textarea>
5858
<span asp-validation-for="Notes"></span>
5959
</div>
6060
</div>

‎AdminUI/LearningHub.Nhs.AdminUI/Views/Catalogue/Edit.cshtml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@
137137
<div class="row mt-5">
138138
<div class="col-12">
139139
<label for="Description">Description</label>
140-
<textarea asp-for="Description" class="form-control"></textarea>
140+
<textarea asp-for="Description" class="form-control nhsuk-input"></textarea>
141141
<small id="with-hint-info" class="pt-2">Only the first 3,000 characters of the description will be used by search</small>
142142
<span asp-validation-for="Description"></span>
143143
</div>

‎AdminUI/LearningHub.Nhs.AdminUI/Views/Notifications/CreateEdit.cshtml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@
7373
</div>
7474
<div class="form-group col-12">
7575
<label asp-for="Message" class="control-label"></label>
76-
<textarea asp-for="Message" class="form-control" rows="10" required></textarea>
76+
<textarea asp-for="Message" class="form-control nhsuk-input" rows="10" required></textarea>
7777
<span asp-validation-for="Message" class="text-danger"></span>
7878
</div>
7979
<div class="form-group col-lg-3 col-md-6">

‎AdminUI/LearningHub.Nhs.AdminUI/Views/Resource/Details.cshtml‎

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -571,6 +571,32 @@
571571
</dl>
572572
</div>
573573
}
574+
@if (Model.ResourceTypeEnum == ResourceTypeEnum.Html)
575+
{
576+
<div class="col-12">
577+
<div class="id-container">Resource Reference ID: @Model.DefaultResourceReferenceId</div>
578+
<dl>
579+
<dt>Resource Version Id</dt>
580+
<dd>@Html.DisplayFor(model => model.ResourceVersionId)</dd>
581+
<dt>Resource Type</dt>
582+
<dd>
583+
@Html.DisplayFor(model => model.ResourceTypeDescription)
584+
</dd>
585+
<dt>ESR Link</dt>
586+
<dd><a href="@Model.HtmlDetails.HostedContentUrl" target="_blank">@Model.HtmlDetails.HostedContentUrl</a></dd>
587+
@if (Model.HtmlDetails.File != null)
588+
{
589+
<dt>Zip File</dt>
590+
<dd>
591+
<a href="@String.Format("{0}file/download/{1}/{2}", webSettings.Value.LearningHubAdminUrl, Model.HtmlDetails.File.FilePath, Model.HtmlDetails.File.FileName)" target="_blank" download>@Model.HtmlDetails.File.FileName</a>
592+
</dd>
593+
}
594+
595+
<dt>Content Folder</dt>
596+
<dd>@Model.HtmlDetails.ContentFilePath</dd>
597+
</dl>
598+
</div>
599+
}
574600

575601
@if (Model.ResourceTypeEnum == ResourceTypeEnum.Assessment)
576602
{

‎AdminUI/LearningHub.Nhs.AdminUI/Views/Shared/_Layout.cshtml‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -78,14 +78,7 @@
7878
</environment>
7979
@*<script type="text/javascript" src="~/js/bundle/header.js"></script>*@
8080
<partial name="~/Views/Shared/_ValidationScriptsPartial.cshtml" />
81-
8281
@RenderSection("Scripts", required: false)
83-
<script type="text/javascript" src="~/js/pageunload.js" asp-append-version="true"></script>
84-
<script type="text/javascript">
85-
// Bind the function to the unload event
86-
window.onunload = tellServerBrowserClosed;
87-
88-
</script>
8982
</body>
9083
</html>
9184
<!-- Build number: @settings.Value.BuildNumber -->

‎AdminUI/LearningHub.Nhs.AdminUI/Views/UserGroup/_UsersModal.cshtml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,10 +41,10 @@
4141
{
4242
<tr>
4343
<td style="vertical-align: middle">
44-
@Html.ActionLink(item.Id.ToString(), "Details", new { id = item.Id })
44+
@Html.ActionLink(item.Id.ToString(), "Details", "User", new { id = item.Id })
4545
</td>
4646
<td style="vertical-align: middle">
47-
@Html.ActionLink(item.UserName.ToString(), "Details", new { id = item.Id })
47+
@Html.ActionLink(item.UserName.ToString(), "Details", "User", new { id = item.Id })
4848
</td>
4949
<td style="vertical-align: middle">
5050
<input type="checkbox" id=@($"user_{item.Id}") class="list-item-checked" />

‎AdminUI/LearningHub.Nhs.AdminUI/wwwroot/js/PageUnload.js‎

Lines changed: 0 additions & 13 deletions
This file was deleted.

0 commit comments

Comments
 (0)