#527: forbid submitting form until notes is filled

VocaDB · Dec 8, 2019 · f9af16e · f9af16e
1 parent c60b4c7
commit f9af16e
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 7 deletions.
diff --git a/VocaDbWeb/App_Code/EntryDetailsHelpers.cshtml b/VocaDbWeb/App_Code/EntryDetailsHelpers.cshtml
@@ -21,6 +21,7 @@
 
 @helper EntryDeletePopupBase(string confirmText, string viewModelBindingName,  string deleteButtonId, string title, string deleteButtonText) {
 
+	<!-- Viewmodel: DeleteEntryViewModel -->
 	<div style="display:none;" title="@title"
 		data-bind="
 		dialog: {
@@ -29,7 +30,7 @@
 		},
 		dialogVisible: @(viewModelBindingName).dialogVisible,
 		dialogButtons: [
-			{ text: '@deleteButtonText', click: @(viewModelBindingName).deleteEntry }, 
+			{ text: '@deleteButtonText', click: @(viewModelBindingName).deleteEntry, disabled: !@(viewModelBindingName).isValid() }, 
 			{ text: '@ViewRes.SharedStrings.Cancel', click: function() { @(viewModelBindingName).dialogVisible(false); } }
 		]
 		">
@@ -38,7 +39,7 @@
 			@confirmText
 		</p>
 
-		<textarea data-bind="textInput: @(viewModelBindingName).notes" class="input-xlarge" maxlength="200"></textarea>
+		<textarea data-bind="textInput: @(viewModelBindingName).notes, attr: { required: @(viewModelBindingName).notesRequired }" class="input-xlarge" maxlength="200"></textarea>
 
 	</div>
 
@@ -109,6 +110,7 @@
 
 @helper ReportEntryPopupKnockout(string viewModelBindingName = "reportViewModel", string reportButtonId = "reportEntryLink") {
 
+	<!-- Viewmodel: ReportEntryViewModel -->
 	<div style="display:none;" title="@ViewRes.EntryDetailsStrings.ReportAnError"
 		 data-bind="
 			with: @viewModelBindingName,

diff --git a/VocaDbWeb/Scripts/ViewModels/DeleteEntryViewModel.ts b/VocaDbWeb/Scripts/ViewModels/DeleteEntryViewModel.ts
@@ -1,9 +1,10 @@
-
+
 module vdb.viewModels {
 
 	export class DeleteEntryViewModel {
 
-		constructor(private deleteCallback: (notes: string) => void) {}
+		constructor(private deleteCallback: (notes: string) => void,
+			public readonly notesRequired: boolean = false) { }
 
 		public deleteEntry = () => {
 			this.dialogVisible(false);
@@ -14,6 +15,9 @@ module vdb.viewModels {
 
 		public notes = ko.observable("");
 
+		/** Report is valid to be sent (either notes are specified or not required) */
+		public isValid = ko.computed(() => !this.notesRequired || this.notes());
+
 		public show = () => this.dialogVisible(true);
 
 	}

diff --git a/VocaDbWeb/Scripts/ViewModels/ReportEntryViewModel.ts b/VocaDbWeb/Scripts/ViewModels/ReportEntryViewModel.ts
@@ -1,4 +1,4 @@
-
+
 module vdb.viewModels {
 
 	export class ReportEntryViewModel {
@@ -15,7 +15,7 @@ module vdb.viewModels {
 
 		public dialogVisible = ko.observable(false);
 
-		// Report is valid to be sent (either notes are specified or not required)
+		/** Report is valid to be sent (either notes are specified or not required) */
 		public isValid: KnockoutComputed<boolean>;
 
 		public notes = ko.observable("");

diff --git a/VocaDbWeb/Scripts/ViewModels/User/UserDetailsViewModel.ts b/VocaDbWeb/Scripts/ViewModels/User/UserDetailsViewModel.ts
@@ -54,7 +54,7 @@ module vdb.viewModels.user {
                     this.reportUserViewModel.notes("");
 				}
 			});
-		});
+		}, true);
 
 		public initComments = () => {