Skip to content

empty framework comment validation #1448

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

Merged
merged 1 commit into from
Nov 3, 2022
Merged

empty framework comment validation #1448

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions DigitalLearningSolutions.Web/Controllers/FrameworksController/Comments.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ public partial class FrameworksController
[Route("/Framework/{frameworkId}/Comments/")]
public IActionResult InsertComment(int frameworkId, string comment)
{
if (comment == "") return RedirectToAction("ViewFramework", new { tabname = "Comments", frameworkId });
if (string.IsNullOrWhiteSpace(comment)) return RedirectToAction("ViewFramework", new { tabname = "Comments", frameworkId });
var adminId = GetAdminId();
var newCommentId = frameworkService.InsertComment(frameworkId, adminId, comment, null);
frameworkNotificationService.SendCommentNotifications(adminId, frameworkId, newCommentId, comment, null, null);
Expand All @@ -30,7 +30,7 @@ public IActionResult ViewThread(int frameworkId, int commentId)
[Route("/Framework/{frameworkId}/Comments/{commentId}")]
public IActionResult InsertReply(int frameworkId, int commentId, string comment, string parentComment)
{
if (comment == "") return RedirectToAction("ViewThread", new { frameworkId, commentId });
if (string.IsNullOrWhiteSpace(comment)) return RedirectToAction("ViewThread", new { frameworkId, commentId });
var adminId = GetAdminId();
var newCommentId = frameworkService.InsertComment(frameworkId, adminId, comment, commentId);
frameworkNotificationService.SendCommentNotifications(adminId, frameworkId, newCommentId, comment, commentId, parentComment);
Expand Down
2 changes: 1 addition & 1 deletion DigitalLearningSolutions.Web/Controllers/FrameworksController/Review.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ public IActionResult SubmitFrameworkReview(int frameworkId, int reviewId, string
{
var adminId = GetAdminId();
int? commentId = null;
if(comment != null) commentId = frameworkService.InsertComment(frameworkId, adminId, comment, null);
if(!string.IsNullOrWhiteSpace(comment)) commentId = frameworkService.InsertComment(frameworkId, adminId, comment, null);
frameworkService.SubmitFrameworkReview(frameworkId, reviewId, signedOff, commentId);
frameworkNotificationService.SendReviewOutcomeNotification(reviewId);
return RedirectToAction("ViewFramework", "Frameworks", new { frameworkId , tabname = "Structure"});
Expand Down