From cd15251b1e4758db245fc50e1903dbacd9ea2c41 Mon Sep 17 00:00:00 2001
From: isc-akadoo <anagha.kadoo@intersystems.com>
Date: Mon, 23 Sep 2024 08:58:50 -0400
Subject: [PATCH 1/3] Fixed folder settings in mappings to be saved and persist

---
 CHANGELOG.md               | 1 +
 csp/gitprojectsettings.csp | 9 +++++++++
 2 files changed, 10 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index da80b602..30644816 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -24,6 +24,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Improved logging in preview and when errors occur via WebSocket commands (#467)
 - Fixed pull event handler handling of extremely long class names from diff (#467)
 - Fixed Git web UI prompt to update file list when file selected/unselected (#478)
+- Fixed folder settings in mappings to be saved and persist (#483)
 
 ## [2.4.1] - 2024-08-02
 
diff --git a/csp/gitprojectsettings.csp b/csp/gitprojectsettings.csp
index 3043afd4..747d3695 100644
--- a/csp/gitprojectsettings.csp
+++ b/csp/gitprojectsettings.csp
@@ -668,6 +668,15 @@ $('[id^=noFoldersSwitch]').click(toggleNoFolders);
 </script>
 </body>
 </html>
+<script method='OnPreHTTP' type="text/javascript">
+    // Check to persist state of no folder switches  
+    $('.mapping-input-group').children('.voca').each(function(){
+        var currElement = $(this).children().children(".custom-control").children()[0]
+        if(!$(currElement).hasClass("active")) {
+            $(currElement).parent().siblings("#NoFolders")[0].value = "NoFolders";
+        }
+    });
+</script>
 <script method='OnPreHTTP' language='cache' runat='server' returntype='%Boolean'>	
 	try {
 		set %session.UseSessionCookie = 1 // Always set back to autodetect

From b2be032e4dd759cb49f738bd15b6e6f2da4c176e Mon Sep 17 00:00:00 2001
From: isc-akadoo <anagha.kadoo@intersystems.com>
Date: Mon, 23 Sep 2024 11:09:15 -0400
Subject: [PATCH 2/3] Moved code changes to existing script block

---
 csp/gitprojectsettings.csp | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/csp/gitprojectsettings.csp b/csp/gitprojectsettings.csp
index 747d3695..c116f6e7 100644
--- a/csp/gitprojectsettings.csp
+++ b/csp/gitprojectsettings.csp
@@ -665,18 +665,16 @@ function toggleNoFolders(e){
 
 $('[id^=noFoldersSwitch]').click(toggleNoFolders);
 
+// Check to persist state of no folder switches  
+$('.mapping-input-group').children('.voca').each(function(){
+    var currElement = $(this).children().children(".custom-control").children()[0]
+    if(!$(currElement).hasClass("active")) {
+        $(currElement).parent().siblings("#NoFolders")[0].value = "NoFolders";
+    }
+});
 </script>
 </body>
 </html>
-<script method='OnPreHTTP' type="text/javascript">
-    // Check to persist state of no folder switches  
-    $('.mapping-input-group').children('.voca').each(function(){
-        var currElement = $(this).children().children(".custom-control").children()[0]
-        if(!$(currElement).hasClass("active")) {
-            $(currElement).parent().siblings("#NoFolders")[0].value = "NoFolders";
-        }
-    });
-</script>
 <script method='OnPreHTTP' language='cache' runat='server' returntype='%Boolean'>	
 	try {
 		set %session.UseSessionCookie = 1 // Always set back to autodetect

From 67925c72525453ae0eea6ea09398999b7d69d98c Mon Sep 17 00:00:00 2001
From: isc-akadoo <anagha.kadoo@intersystems.com>
Date: Mon, 23 Sep 2024 11:10:46 -0400
Subject: [PATCH 3/3] Version updated to 2.5.0

---
 module.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/module.xml b/module.xml
index 0ddd02b1..fd8f8b2b 100644
--- a/module.xml
+++ b/module.xml
@@ -3,7 +3,7 @@
   <Document name="git-source-control.ZPM">
     <Module>
       <Name>git-source-control</Name>
-      <Version>2.4.1</Version>
+      <Version>2.5.0</Version>
       <Description>Server-side source control extension for use of Git on InterSystems platforms</Description>
       <Keywords>git source control studio vscode</Keywords>
       <Packaging>module</Packaging>