[bot] Merge 26.7 to 26.8

Viral_Load_Assay/resources/assay/Viral_Loads/queries/Viral_Load_Summary.sql

@@ -23,7 +23,7 @@ count(*) as replicates,
 stddev(viralLoad) as stdDeviation,
 group_concat(distinct v.qcflag, ';') as qcflags,
 group_concat(distinct v.comment, ';') as comments,
-cast(min(v.well) as varchar) as lowestWell,~
+cast(min(v.well) as varchar) as lowestWell,
 v.run,
 v.folder,
 v.workbook

ehr/resources/web/ehr/data/DataEntryServerStore.js

@@ -64,9 +64,17 @@ Ext4.define('EHR.data.DataEntryServerStore', {
                 }
             }, this);
 
-            if (ret){
-                return ret;
-            }
+            // An empty key cannot identify an existing record, so stop here rather than falling
+            // through to findExact() below -- an empty value matches ANY earlier unsaved record
+            // whose key is likewise empty, so the 2nd and later new rows all resolve to the 1st
+            // and collapse onto it, leaving only the last row's values. Returning nothing lets
+            // processServerRecords() create a server record bound to this client model instead.
+            //
+            // Only tables keyed on a server-assigned identity column hit this: study datasets key
+            // on objectid, which is generated client-side per row and so is never empty. A table
+            // whose sole key is a SERIAL (nbri_ehr.Conception.rowId) has an empty key on every new
+            // row, making it impossible to add more than one row per save.
+            return ret;
         }
 
         var idx = this.findExact(fieldName, value);