Merge 23.7 to 23.11

cnathe · cnathe · commit de2195f63f36 · 2024-01-15T11:04:56.000-06:00
# Conflicts:
#	blast/src/org/labkey/blast/view/jobDetails.jsp
diff --git a/blast/src/org/labkey/blast/view/jobDetails.jsp b/blast/src/org/labkey/blast/view/jobDetails.jsp
@@ -197,8 +197,8 @@
 
 </script>
 
-<div id=<%=q(h(renderTarget))%>></div>
-<div id=<%=q(h(renderTarget + "_results"))%>>
+<div id="<%=h(renderTarget)%>"></div>
+<div id="<%=h(renderTarget + "_results")%>">
     <%
         if (job.isHasRun())
         {

Original file line number	Diff line number	Diff line change
`@@ -197,8 +197,8 @@`
`197`	`197`
`198`	`198`	`</script>`
`199`	`199`
`200`		`-<div id=<%=q(h(renderTarget))%>></div>`
`201`		`-<div id=<%=q(h(renderTarget + "_results"))%>>`
	`200`	`+<div id="<%=h(renderTarget)%>"></div>`
	`201`	`+<div id="<%=h(renderTarget + "_results")%>">`
`202`	`202`	`<%`
`203`	`203`	`if (job.isHasRun())`
`204`	`204`	`{`