SAK-48517 Canceling the creation of a citation list is creating the list

axxter99 · Feb 23, 2023 · 9ed4f8c · 9ed4f8c
1 parent 254250d
commit 9ed4f8c
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 18 deletions.
diff --git a/citations/citations-tool/tool/src/webapp/js/new_resource.js b/citations/citations-tool/tool/src/webapp/js/new_resource.js
@@ -538,27 +538,29 @@ citations_new_resource.init = function() {
 		citations_new_resource.processClick(successObj);
 		return false;
 	});
+	$('.submit').on('click', function(eventObject) {
+
+		SPNR.disableControlsAndSpin( this, null );
+
+		var successObj = {
+			invoke				: function(jsObj) {
+				$('#sakai_action').val('doCancel');
+				$('#ajaxRequest').val('false');
+				$('#newCitationListForm').attr('method', 'GET');
+				$('#newCitationListForm').submit();
+			}
+		};
+		citations_new_resource.processClick(successObj);
+		return false;
+	});
 	$('.Cancel').on('click', function(eventObject) {
 
 		SPNR.disableControlsAndSpin( this, null );
 
-		if(needToSaveAnyChanges()) {
-			var successObj = {
-					invoke				: function(jsObj) {
-						$('#sakai_action').val('doCancel');
-						$('#ajaxRequest').val('false');
-						$('#newCitationListForm').attr('method', 'GET');
-						$('#newCitationListForm').submit();
-					}
-				};
-				citations_new_resource.processClick(successObj);
-				return false;
-		} else {
-			$('#sakai_action').val('doCancel');
-			$('#ajaxRequest').val('false');
-			$('#newCitationListForm').attr('method', 'GET');
-			$('#newCitationListForm').submit();
-		}
+		$('#sakai_action').val('doCancel');
+		$('#ajaxRequest').val('false');
+		$('#newCitationListForm').attr('method', 'GET');
+		$('#newCitationListForm').submit();
 	});
 	$('#access_mode_groups').on('change', function(eventObject) {
 		$('#groupTable').toggle();

diff --git a/citations/citations-tool/tool/src/webapp/vm/citation/new_resource.vm b/citations/citations-tool/tool/src/webapp/vm/citation/new_resource.vm
@@ -157,7 +157,7 @@
 	<div class="act">
 		<div class="citationsDisplay"#if(! ($collectionSize || $collectionSize < 1) && ! ($nestedSectionsSize || $nestedSectionsSize < 1)) style="display:none;"#end>
 			<div class="act">
-				<input type="button" name="Cancel" class="Cancel active" value="$tlang.getString("resource.done")" />
+				<input type="button" name="Cancel" class="submit active" value="$tlang.getString("resource.done")" />
 			</div>
 			<div class="currentListCitations">
 				#parse( "vm/citation/_listCitations.vm" )