Merge pull request #170 from LabKey/fb_merge_23.3_to_develop

Merge 23.3 to develop

Author: bbimber

LabPurchasing/resources/web/labpurchasing/panel/VendorPanel.js

@@ -68,11 +68,11 @@ Ext4.define('LabPurchasing.panel.VendorPanel', {
             return;
         }
 
-        function onSuccess(store){
+        function onSuccess(){
             this.mun(this.store, onError);
             btn.setDisabled(false);
 
-            var store = Ext4.StoreManager.get('labpurchasing||vendors||rowId||vendorName||');
+            var store = Ext4.StoreManager.get(LABKEY.ext4.Util.getLookupStoreId({lookup: {schemaName: 'labpurchasing', queryName: 'vendors', keyColumn: 'rowId', displayColumn: 'vendorName'}}));
             if (store) {
                 store.load();
             }

variantdb/src/org/labkey/variantdb/analysis/ImputationAnalysis.java

@@ -315,13 +315,13 @@ public void processFilesRemote(List<SequenceOutputFile> inputFiles, JobContext c
             File alleleFreqDir = new File(job.getJobSupport(FileAnalysisJobSupport.class).getAnalysisDirectory(), "alleleFreqs");
             alleleFreqDir.mkdirs();
 
-            if (params.get("minGenotypeQual") != null)
+            if (!params.isNull("minGenotypeQual"))
             {
                 job.getLogger().info("setting minGenotypeQual: " + params.get("minGenotypeQual"));
                 runner.setMinGenotypeQual(params.getInt("minGenotypeQual"));
             }
 
-            if (params.get("minGenotypeDepth") != null)
+            if (!params.isNull("minGenotypeDepth"))
             {
                 job.getLogger().info("setting minGenotypeDepth: " + params.get("minGenotypeDepth"));
                 runner.setMinGenotypeDepth(params.getInt("minGenotypeDepth"));
@@ -373,7 +373,7 @@ public void processFilesRemote(List<SequenceOutputFile> inputFiles, JobContext c
 
                     //now actually perform imputation
                     job.setStatus(PipelineJob.TaskStatus.running, "Imputing: " + idx + " of " + sets.size());
-                    String callMethod = params.get("callMethod") != null ? params.getString("callMethod") : "1";
+                    String callMethod = !params.isNull("callMethod") ? params.getString("callMethod") : "1";
                     runner.processSet(baseDir, alleleFreqDir, job.getLogger(), ss.wgsSampleIds, ss.imputedSampleIds, callMethod);
 
                     job.setStatus(PipelineJob.TaskStatus.running, "Making VCF / Evaluating Accuracy");