#527: ignore report with no notes

VocaDB · Nov 20, 2019 · 4ba2197 · 4ba2197
1 parent c9841c2
commit 4ba2197
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 2 deletions.
diff --git a/VocaDbModel/Database/Queries/UserQueries.cs b/VocaDbModel/Database/Queries/UserQueries.cs
@@ -521,6 +521,11 @@ class CachedUserStats {
 
 			PermissionContext.VerifyPermission(PermissionToken.ReportUser);
 
+			if (string.IsNullOrEmpty(notes)) {
+				log.Error("Notes are required");
+				return (false, 0);
+			}
+
 			return repository.HandleTransaction(ctx => {
 				var user = ctx.Load(userId);
 

diff --git a/VocaDbWeb/Scripts/User/Details.ts b/VocaDbWeb/Scripts/User/Details.ts
@@ -1,4 +1,4 @@
-import rep = vdb.repositories;
+import rep = vdb.repositories;
 
 function initPage(confirmDisableStr: string) {
 
@@ -7,6 +7,7 @@ function initPage(confirmDisableStr: string) {
 	$("#composeMessageLink").button({ icons: { primary: 'ui-icon-mail-closed' } });
 	$("#editUserLink").button({ icons: { primary: 'ui-icon-wrench' } });
 	$("#disableUserLink").button({ icons: { primary: 'ui-icon-close' } });
+    $("#reportUserLink").button({ icons: { primary: 'ui-icon-close' } });
 	$("#setToLimitedLink").button({ icons: { primary: 'ui-icon-close' } });
 	$("#avatar").tooltip(<any>{ placement: "bottom" });
 

diff --git a/VocaDbWeb/Views/User/Details.cshtml b/VocaDbWeb/Views/User/Details.cshtml
@@ -72,7 +72,7 @@
 	}
 	@if (Login.Manager.HasPermission(PermissionToken.ReportUser) && UserContext.LoggedUserId != Model.Id && Model.GroupId <= UserGroupId.Trusted && Model.Active) {
 		@Html.Raw("&nbsp;")
-		<a href="" id="reportUser" data-bind="click: function() { reportUserViewModel.show(); }">@Res.ReportSpamming</a>
+		<a href="" id="reportUserLink" data-bind="click: function() { reportUserViewModel.show(); }">@Res.ReportSpamming</a>
 	}
 	@if (Login.Manager.HasPermission(PermissionToken.RemoveEditPermission) && UserContext.LoggedUserId != Model.Id && Model.GroupId != UserGroupId.Limited && Model.Active && EntryPermissionManager.CanEditUser(Login.Manager, Model.GroupId)) {
 		@Html.Raw("&nbsp;")
@@ -419,6 +419,7 @@
 }
 
 @EntryDetailsHelpers.EntryDeletePopupBase("Please confirm that you wish to remove user's editing permissions. You may provide additional explanation below (optional).", "limitedUserViewModel", "setToLimitedLink", "Remove editing permissions", "Confirm")
+@EntryDetailsHelpers.EntryDeletePopupBase("Please confirm that you wish to report user. Please provide additional explanation below.", "reportUserViewModel", "reportUserLink", "Report user", "Confirm")
 
 @section Head {
 	@Styles.Render("~/Scripts/jqwidgets27/styles/css")