Merge branch 'hotfix/1.21.1' into develop

pdl · pdl · commit 10241b3506ec · 2025-11-24T09:27:36.000Z
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,10 @@
+### 1.21.1
+
+**CITES Trade DB**
+
+* Background image changed from rhinos to orchids.
+* Fix an issue where IFS permit ids were not output in CSVs.
+
 ### 1.21.0
 
 **Species+**
diff --git a/app/assets/images/cites_trade/cites_trade_hero.png b/app/assets/images/cites_trade/cites_trade_hero.png
diff --git a/app/services/trade/shipment_report_queries.rb b/app/services/trade/shipment_report_queries.rb
@@ -275,6 +275,7 @@ def self.full_db_query(limit, offset)
       import_permit_number AS import_permit,
       export_permit_number AS export_permit,
       origin_permit_number AS origin_permit,
+      ifs_permit_number AS ifs_permit,
       legacy_shipment_number AS legacy_shipment_no,
       uc.name AS created_by,
       uu.name AS updated_by
@@ -343,6 +344,7 @@ def self.partial_db_query(limit, offset, updated_at: nil, created_at: nil)
       import_permit_number AS import_permit,
       export_permit_number AS export_permit,
       origin_permit_number AS origin_permit,
+      ifs_permit_number AS ifs_permit,
       legacy_shipment_number AS legacy_shipment_no,
       uc.name AS created_by,
       uu.name AS updated_by,
diff --git a/app/views/layouts/cites_trade.html.erb b/app/views/layouts/cites_trade.html.erb
@@ -106,7 +106,7 @@
             </div>
           </div>
           <span class="header__image-credit">
-            <%= t('image_credits') %> AdobeStock_255618473
+            <%= t('image_credits') %> AdobeStock_260502692
           </span>
         </div>
       </div>
