From e41326d8213d3153f3b12c632f04398d2c3bd571 Mon Sep 17 00:00:00 2001
From: Chad Sebranek <csebranek@gmail.com>
Date: Thu, 17 Apr 2025 16:14:00 -0500
Subject: [PATCH 1/2] Fix for creating templates from selected records (#936)

* fix for selecting records for a template

* undo console log
---
 ehr/resources/web/ehr/window/SaveTemplateWindow.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/ehr/resources/web/ehr/window/SaveTemplateWindow.js b/ehr/resources/web/ehr/window/SaveTemplateWindow.js
index 6a727c2ac..63d222e80 100644
--- a/ehr/resources/web/ehr/window/SaveTemplateWindow.js
+++ b/ehr/resources/web/ehr/window/SaveTemplateWindow.js
@@ -204,7 +204,8 @@ Ext4.define('EHR.window.SaveTemplateWindow', {
         var rows = [];
 
         this.down('#theForm').items.each(function(tab){
-            var selections = tab.down('#recordSelector').getValue().inputValue;
+            var radioGroup = tab.down('#recordSelector');
+            var selections = radioGroup.getValue()[radioGroup.down('[name]').name];
             var fields = tab.down('#fieldSelector').getValue().fields;
 
             if (!fields.length)
@@ -220,7 +221,7 @@ Ext4.define('EHR.window.SaveTemplateWindow', {
 
             var records = [];
             if (selections == 'selected'){
-                records = this.grid.getSelectionModel().getSelections();
+                records = this.targetGrid.getSelectionModel().getSelection();
 
                 if (!records.length){
                     Ext4.Msg.hide();

From 1dfd53114c1828068ddc8a947440dd0749827a9b Mon Sep 17 00:00:00 2001
From: "F. Daniel Nicolalde" <fdnicolalde@wisc.edu>
Date: Fri, 18 Apr 2025 15:05:44 -0500
Subject: [PATCH 2/2] Adding option to the navMenu to add a target when
 generating links in ExtJS. (#926)

---
 ehr/resources/web/ehr/navMenu.js | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/ehr/resources/web/ehr/navMenu.js b/ehr/resources/web/ehr/navMenu.js
index 74bbd49af..8f4d6048c 100644
--- a/ehr/resources/web/ehr/navMenu.js
+++ b/ehr/resources/web/ehr/navMenu.js
@@ -107,11 +107,19 @@ Ext4.define('EHR.NavMenu', {
                     item = this.renderer(tmp.items[j])
                 }
                 else {
-                   //NOTE: this is the default renderer
-                   item = {
-                       //Creates links for the navigation panel
-                        html: '<a href="'+tmp.items[j].url+'">'+tmp.items[j].name+'</a>'
+                    if (tmp.items[j].target){
+                        item = {
+                            //Creates links for the navigation panel to a target
+                            html: '<a target="'+tmp.items[j].target+'" href="'+tmp.items[j].url+'">'+tmp.items[j].name+'</a>'
+                        }
+                    }else{
+                        item = {
+                            //Creates links for the navigation panel
+                            html: '<a href="'+tmp.items[j].url+'">'+tmp.items[j].name+'</a>'
+                        }
                     }
+                   //NOTE: this is the default renderer
+
                 }
                 section.add(item)
             }