From 7fffd90535621c75d8618d0c3dad5c1012c7fd69 Mon Sep 17 00:00:00 2001
From: Nick dos Remedios <nick.dosremedios@csiro.au>
Date: Tue, 26 Nov 2024 16:01:58 +1100
Subject: [PATCH 1/2] Delete .DS_Store

---
 .DS_Store | Bin 6148 -> 0 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
 delete mode 100644 .DS_Store

diff --git a/.DS_Store b/.DS_Store
deleted file mode 100644
index 8f7026824783bb4152ab96dd1a1ed6fbf1b0dd22..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 6148
zcmeHKI|>3Z5S{S@f{mqRuHX%V=n1@l$btx>AZWdn=kjR2`83P2ofgU)n7m{%FCnkk
z*%1+4-<y@lLPTb8LwVZJH`_Pw*(f6lgyW3nvAbQ)*UPb&I}|YPR1R{Nlbkzz+o4eb
zDnJFO02QDDpH?6%>}>w&gLxhmpaMUyfPEhd+^{CLf&S^h;4J`fg0LIr-b(<B1%NfN
z4MYT{K?Md?v&GP$BVIDECboe=7tQ8F^JdKsMg4Z1Up!s326ChVRG_QCIF<{m|6BM#
z|KBBXMFpt9Un!uI&2F>Cld`t<9%r?-!1r*=dBM#vcM1kC$3QQ~SXen;dQ#*Sn`6Hw
Uwt-GZ-0496445u7D)4Ou-khQox&QzG


From 92b2e11a6d662d11fc011939ff34ed2476d6bf23 Mon Sep 17 00:00:00 2001
From: Nick dos Remedios <nick.dosremedios@csiro.au>
Date: Tue, 26 Nov 2024 16:03:21 +1100
Subject: [PATCH 2/2] #319 Fix for SQL error for family popup link

---
 .gitignore                                  | 1 +
 grails-app/views/speciesListItem/_facet.gsp | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index 35674d19..6a92efef 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,6 +6,7 @@ out
 /.slcache
 /logs
 *.iml
+.DS_Store
 grails-app/.DS_Store
 grails-app/controllers/.DS_Store
 grails-app/controllers/au/.DS_Store
diff --git a/grails-app/views/speciesListItem/_facet.gsp b/grails-app/views/speciesListItem/_facet.gsp
index 960b055e..1a570ca6 100644
--- a/grails-app/views/speciesListItem/_facet.gsp
+++ b/grails-app/views/speciesListItem/_facet.gsp
@@ -64,7 +64,7 @@
                                             </g:if>
                                             <g:else>
                                                 <td><g:link action="list" id="${params.id}"
-                                                            params="${[fq: sl.buildFqList(fqs: fqs, fq: "${key}:${arr[0]}"), q: params.q, max: params.max]}">${arr[0]}</g:link></td>
+                                                            params="${[fq: sl.buildFqList(fqs: fqs, fq: "${QueryService.MATCHED_FAMILY.equals(key) ? 'matched family' : key}:${arr[0]}"), q: (params.q) ?: null, max: params.max]}">${arr[0]}</g:link></td>
                                                 <td style="text-align: right; border-right-style: none;">${arr[1]}</td>
                                             </g:else>
                                         </tr>