From 660bd0b43c313ea347db13a8a62a9a48018486aa Mon Sep 17 00:00:00 2001 From: Marty Pradere Date: Fri, 14 Jun 2019 16:52:17 -0700 Subject: [PATCH 1/2] Issue 37705: Animal history single animal filter should show no data for invalid ID Use new ehr single animal filter to fix issue where invalid ID shows whole db in reports --- onprc_ehr/resources/views/animalHistory.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/onprc_ehr/resources/views/animalHistory.html b/onprc_ehr/resources/views/animalHistory.html index 6f39260b4..48cdc301c 100644 --- a/onprc_ehr/resources/views/animalHistory.html +++ b/onprc_ehr/resources/views/animalHistory.html @@ -11,7 +11,7 @@ defaultTab: 'General', showFilterOptionsTitle: true, filterTypes: [{ - xtype: 'ldk-singlesubjectfiltertype', + xtype: 'ehr-singleanimalfiltertype', inputValue: LDK.panel.SingleSubjectFilterType.filterName, label: 'Single Animal', aliasTable: { From fd682e578b7140216231c3d12c73e12de58c58fa Mon Sep 17 00:00:00 2001 From: Marty Pradere Date: Tue, 18 Jun 2019 18:08:28 -0700 Subject: [PATCH 2/2] Add ehr single animal filter dependency --- onprc_ehr/resources/views/animalHistory.view.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/onprc_ehr/resources/views/animalHistory.view.xml b/onprc_ehr/resources/views/animalHistory.view.xml index 2b220c511..c93de3c36 100644 --- a/onprc_ehr/resources/views/animalHistory.view.xml +++ b/onprc_ehr/resources/views/animalHistory.view.xml @@ -5,6 +5,7 @@ +