Merge branch 'hotfix-bugs'

Indicia-Team · Oct 2, 2024 · d820419 · d820419
2 parents 914e907 + 1ad0916
commit d820419
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 6 deletions.
diff --git a/application/config/version.php b/application/config/version.php
@@ -29,14 +29,14 @@
  *
  * @var string
  */
-$config['version'] = '9.4.0';
+$config['version'] = '9.4.1';
 
 /**
  * Version release date.
  *
  * @var string
  */
-$config['release_date'] = '2024-09-25';
+$config['release_date'] = '2024-10-02';
 
 /**
  * Link to the code repository downloads page.

diff --git a/modules/indicia_svc_import/controllers/services/import.php b/modules/indicia_svc_import/controllers/services/import.php
@@ -34,7 +34,7 @@
  */
 class FirstRowReadFilter implements IReadFilter {
 
-  public function readCell($column, $row, $worksheetName = '') {
+  public function readCell($columnAddress, $row, $worksheetName = ''): bool {
     return $row == 1;
   }
 
@@ -67,7 +67,7 @@ public function __construct($offset, $limit) {
   /**
    * Limit range of rows.
    */
-  public function readCell($column, $row, $worksheetName = '') {
+  public function readCell($columnAddress, $row, $worksheetName = ''): bool {
     return $row >= $this->offset && $row < $this->offset + $this->limit;
   }
 

diff --git a/reports/library/occurrence_attributes/occurrence_attributes_for_form.xml b/reports/library/occurrence_attributes/occurrence_attributes_for_form.xml
@@ -11,7 +11,7 @@
     JOIN cache_taxa_taxon_lists cttlany ON cttlany.external_key=ctp.external_key
       AND cttlany.id in (#taxa_taxon_list_id#)
     JOIN cache_taxa_taxon_lists cttlattrlink ON cttlattrlink.taxon_meaning_id=tr.restrict_to_taxon_meaning_id
-      AND cttlattrlink.preferred=true AND cttlattrlink.taxon_list_id=#master_checklist_id#
+      AND cttlattrlink.preferred=true
     LEFT JOIN occurrence_attribute_values av ON av.occurrence_attribute_id=a.id AND av.deleted=false
       AND av.occurrence_id in (#occurrence_id#)
     LEFT JOIN cache_termlists_terms t ON t.id=av.int_value AND a.data_type='L'
@@ -37,7 +37,6 @@
     <param name="survey_id" display="Survey ID" datatype="integer">
       <where>aw.restrict_to_survey_id=#survey_id#</where>
     </param>
-    <param name="master_checklist_id" display="Taxon list ID of the master checklist" datatype="integer" />
     <param name="taxa_taxon_list_id" display="Taxa taxon list ID or IDs" datatype="integer[]" />
     <param name="stage_termlists_term_ids" display="Life stage termlists term IDs" datatype="integer[]" default="">
       <join>LEFT JOIN cache_termlists_terms stage on stage.meaning_id=tr.restrict_to_stage_term_meaning_id</join>>