From cf3b38e9bad9753d00f4ec0f49aacfa3fc6ad392 Mon Sep 17 00:00:00 2001
From: Mark Noble <mdnoble73@gmail.com>
Date: Mon, 29 Jul 2024 08:27:21 -0600
Subject: [PATCH] Fixed a bug where, if a user tried to use filters in the
 Translation section and pressed the Enter key, Translation mode was activated
 instead of updating the filters

Manual merge of PR: https://github.com/Aspen-Discovery/aspen-discovery/pull/1882
---
 .../themes/responsive/Greenhouse/siteStatus.tpl          | 2 +-
 .../themes/responsive/Translation/translations.tpl       | 9 ++++++---
 code/web/interface/themes/responsive/js/aspen.js         | 2 +-
 code/web/interface/themes/responsive/js/aspen/base.js    | 2 +-
 code/web/release_notes/24.08.00.MD                       | 4 +++-
 5 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/code/web/interface/themes/responsive/Greenhouse/siteStatus.tpl b/code/web/interface/themes/responsive/Greenhouse/siteStatus.tpl
index 0a96621463..bb4471b781 100644
--- a/code/web/interface/themes/responsive/Greenhouse/siteStatus.tpl
+++ b/code/web/interface/themes/responsive/Greenhouse/siteStatus.tpl
@@ -5,7 +5,7 @@
 		</div>
 	</div>
 
-	<form class="form" id="translationSettings">
+	<form class="form" id="serverOptions">
 		<div class="row">
 			<div class="col-xs-12 col-md-3">
 				<label for="showErrorsOnly">{translate text='Show Errors Only' isAdminFacing=true}</label>
diff --git a/code/web/interface/themes/responsive/Translation/translations.tpl b/code/web/interface/themes/responsive/Translation/translations.tpl
index a09002a767..b9d2470b42 100644
--- a/code/web/interface/themes/responsive/Translation/translations.tpl
+++ b/code/web/interface/themes/responsive/Translation/translations.tpl
@@ -1,12 +1,12 @@
 {strip}
 <div id="main-content" class="col-md-12">
 	<h1>{translate text="Translations" isAdminFacing=true}</h1>
-	<form class="form" id="translationSettings">
+	<form class="form" id="translationSettingsToolbar">
 		<div class="form-group">
 			{if !empty($translationModeActive)}
-				<button class="btn btn-primary" type="submit" name="stopTranslationMode">{translate text="Exit Translation Mode" isAdminFacing=true}</button>
+				<button class="btn btn-primary" name="stopTranslationMode" onclick="return AspenDiscovery.changeTranslationMode(false)">{translate text="Exit Translation Mode" isAdminFacing=true}</button>
 			{else}
-				<button class="btn btn-primary" type="submit" name="startTranslationMode">{translate text="Start Translation Mode" isAdminFacing=true}</button>
+				<button class="btn btn-primary"name="startTranslationMode" onclick="return AspenDiscovery.changeTranslationMode(true)">{translate text="Start Translation Mode" isAdminFacing=true}</button>
 			{/if}
 
 			<button class="btn btn-primary" type="submit" name="exportAllTranslations">{translate text="Export All Translations" isAdminFacing=true}</button>
@@ -14,6 +14,9 @@
 			<a class="btn btn-primary" id="importTranslations" href="/Translation/ImportTranslations">{translate text="Import Translations" isAdminFacing=true}</a>
 			<a class="btn btn-primary" id="importBulkTranslations" href="/Translation/ImportBulkTranslations">{translate text="Import Bulk Translations" isAdminFacing=true}</a>
 		</div>
+	</form>
+
+	<form class="form" id="translationSettings">
 		<div class="form-group">
 			<input type="checkbox" name="hideTranslated" id="hideTranslated" {if !empty($showTranslated)}checked{/if}>&nbsp;
 			<label for="hideTranslated">{translate text="Hide terms that have been translated already" isAdminFacing=true}</label>
diff --git a/code/web/interface/themes/responsive/js/aspen.js b/code/web/interface/themes/responsive/js/aspen.js
index a0de53c974..76b269e4c9 100644
--- a/code/web/interface/themes/responsive/js/aspen.js
+++ b/code/web/interface/themes/responsive/js/aspen.js
@@ -5135,7 +5135,7 @@ var AspenDiscovery = (function(){
 
 		changeTranslationMode: function(start){
 			var url = window.location.href;
-			url = url.replace(/[&?](start|stop)TranslationMode=true/, '');
+			url = url.replace(/[&?](start|stop)TranslationMode=(true)?/, '');
 			if (start) {
 				url = this.buildUrl(url,'startTranslationMode', 'true');
 			}else{
diff --git a/code/web/interface/themes/responsive/js/aspen/base.js b/code/web/interface/themes/responsive/js/aspen/base.js
index bb50599951..986d4fc761 100644
--- a/code/web/interface/themes/responsive/js/aspen/base.js
+++ b/code/web/interface/themes/responsive/js/aspen/base.js
@@ -468,7 +468,7 @@ var AspenDiscovery = (function(){
 
 		changeTranslationMode: function(start){
 			var url = window.location.href;
-			url = url.replace(/[&?](start|stop)TranslationMode=true/, '');
+			url = url.replace(/[&?](start|stop)TranslationMode=(true)?/, '');
 			if (start) {
 				url = this.buildUrl(url,'startTranslationMode', 'true');
 			}else{
diff --git a/code/web/release_notes/24.08.00.MD b/code/web/release_notes/24.08.00.MD
index c878c30fbf..a5982213fc 100644
--- a/code/web/release_notes/24.08.00.MD
+++ b/code/web/release_notes/24.08.00.MD
@@ -88,7 +88,9 @@ To generate the passkey file, the following command should be run (as root):
 `php /usr/local/aspen-discovery/code/web/cron/createKeyFile.php <serverName>`
 
 // lucas
-
+### Other Updates
+- Fixed a bug where, if a user tried to use filters in the Translation section and pressed the Enter key, Translation mode was activated instead of updating the filters. (Ticket 117950) (*LM, MDN*)
+- 
 // James Staub
 ### Reports
 - Nashville-specific: Circulation Holds Report now includes item-level holds (*JStaub*)