Skip to content

Commit 2670516

Browse files
Merge pull request #272 from TechnologyEnhancedLearning/Develop/Features/TD-4016-Remove-character-limit-from-catalogue-description
TD-4016:Remove character limit from catalogue description
2 parents 5c2e39e + bd7ec86 commit 2670516

File tree

6 files changed

+8
-12
lines changed

6 files changed

+8
-12
lines changed

AdminUI/LearningHub.Nhs.AdminUI/LearningHub.Nhs.AdminUI.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@
8989
<PackageReference Include="HtmlSanitizer" Version="6.0.453" />
9090
<PackageReference Include="IdentityModel" Version="4.4.0" />
9191
<PackageReference Include="LearningHub.Nhs.Caching" Version="2.0.2" />
92-
<PackageReference Include="LearningHub.Nhs.Models" Version="3.0.30" />
92+
<PackageReference Include="LearningHub.Nhs.Models" Version="3.0.31" />
9393
<PackageReference Include="Microsoft.ApplicationInsights.AspNetCore" Version="2.19.0" />
9494
<PackageReference Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="6.0.0" />
9595
<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="6.0.0" />

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

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,6 @@
138138
<div class="col-12">
139139
<label for="Description">Description</label>
140140
<textarea asp-for="Description" class="form-control"></textarea>
141-
<small id="with-hint-info" class="pt-2">You have 1800 characters remaining</small>
142141
<span asp-validation-for="Description"></span>
143142
</div>
144143
</div>
@@ -413,13 +412,6 @@
413412
var editorData = editor.getData();
414413
var data = $("<p></p>").html(editorData).text();
415414
var textData = data.replace(/\s\n\n/g, ' ').replace(/\n\n/g, ' ').replace(/\s\n/g, '').replace(/\n/g, '');
416-
var remaining = 1800 - textData.length;
417-
418-
if (remaining >= 0) {
419-
$('#with-hint-info').text("You have " + remaining + " characters remaining").removeClass('text-danger');
420-
} else {
421-
$('#with-hint-info').text("You have " + (-1 * remaining) + " character too many").addClass('text-danger');
422-
}
423415
});
424416
425417
editor.fire('change');

LearningHub.Nhs.WebUI/LearningHub.Nhs.WebUI.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@
108108
<PackageReference Include="HtmlAgilityPack" Version="1.11.38" />
109109
<PackageReference Include="IdentityModel" Version="4.3.0" />
110110
<PackageReference Include="LearningHub.Nhs.Caching" Version="2.0.0" />
111-
<PackageReference Include="LearningHub.Nhs.Models" Version="3.0.30" />
111+
<PackageReference Include="LearningHub.Nhs.Models" Version="3.0.31" />
112112
<PackageReference Include="linqtotwitter" Version="6.9.0" />
113113
<PackageReference Include="Microsoft.ApplicationInsights.AspNetCore" Version="2.19.0" />
114114
<PackageReference Include="Microsoft.ApplicationInsights.EventCounterCollector" Version="2.21.0" />

WebAPI/LearningHub.Nhs.API/LearningHub.Nhs.Api.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
<PackageReference Include="elfhHub.Nhs.Models" Version="3.0.8" />
2828
<PackageReference Include="IdentityServer4.AccessTokenValidation" Version="3.0.1" />
2929
<PackageReference Include="LearningHub.Nhs.Caching" Version="2.0.0" />
30-
<PackageReference Include="LearningHub.Nhs.Models" Version="3.0.30" />
30+
<PackageReference Include="LearningHub.Nhs.Models" Version="3.0.31" />
3131
<PackageReference Include="Microsoft.ApplicationInsights.AspNetCore" Version="2.19.0" />
3232
<PackageReference Include="Microsoft.AspNetCore" Version="2.2.0" />
3333
<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="6.0.0" />

WebAPI/LearningHub.Nhs.Database/Scripts/Pre-Deploy/Script.PreDeployment.sql

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,3 +18,7 @@ BEGIN
1818
RAISERROR (N'TD-2902 Add resource types to Content Server.sql must be run manually before release.', 16, 127) WITH NOWAIT
1919
END
2020
GO
21+
22+
--TD-4016-Remove character limit from catalogue description
23+
ALTER TABLE hierarchy.CatalogueNodeVersion ALTER COLUMN Description nvarchar(max);
24+
GO

WebAPI/LearningHub.Nhs.Database/Stored Procedures/Hierarchy/CatalogueCreate.sql

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ CREATE PROCEDURE [hierarchy].[CatalogueCreate]
2020
@CardImageUrl nvarchar(128),
2121
@BannerUrl nvarchar(128) null,
2222
@Order int,
23-
@Description nvarchar(4000),
23+
@Description nvarchar(max),
2424
@UserId int,
2525
@Hidden bit,
2626
@Keywords nvarchar(max),

0 commit comments

Comments
 (0)