Merge 26.3 to 26.7

labkey-teamcity · labkey-teamcity · commit eb67f557950e · 2026-07-27T01:03:22.000Z
diff --git a/core/src/org/labkey/core/security/addUsers.jsp b/core/src/org/labkey/core/security/addUsers.jsp
@@ -40,11 +40,6 @@
     boolean excludeSiteAdmins = !getUser().hasSiteAdminPermission(); // App admins can't clone permissions from site admins
 %>
 <script type="text/javascript" nonce="<%=getScriptNonce()%>">
-    document.addEventListener("DOMContentLoaded", function() {
-        if (LABKEY.ActionURL.getParameter('provider')) {
-            document.getElementById('provider').value = LABKEY.ActionURL.getParameter('provider');
-        }
-    });
 
     function enableText()
     {
@@ -139,7 +134,7 @@
     <%
         if (form.getProvider() != null)
         {
-            %><input type="hidden" name="provider" id="provider" value=<%=h(form.getProvider())%>><%
+            %><input type="hidden" name="provider" id="provider" value="<%=h(form.getProvider())%>"><%
         }
         else
         {

Original file line number	Diff line number	Diff line change
`@@ -40,11 +40,6 @@`
`40`	`40`	`boolean excludeSiteAdmins = !getUser().hasSiteAdminPermission(); // App admins can't clone permissions from site admins`
`41`	`41`	`%>`
`42`	`42`	`<script type="text/javascript" nonce="<%=getScriptNonce()%>">`
`43`		`- document.addEventListener("DOMContentLoaded", function() {`
`44`		`- if (LABKEY.ActionURL.getParameter('provider')) {`
`45`		`- document.getElementById('provider').value = LABKEY.ActionURL.getParameter('provider');`
`46`		`- }`
`47`		`- });`
`48`	`43`
`49`	`44`	`function enableText()`
`50`	`45`	`{`
`@@ -139,7 +134,7 @@`
`139`	`134`	`<%`
`140`	`135`	`if (form.getProvider() != null)`
`141`	`136`	`{`
`142`		`- %><input type="hidden" name="provider" id="provider" value=<%=h(form.getProvider())%>><%`
	`137`	`+ %><input type="hidden" name="provider" id="provider" value="<%=h(form.getProvider())%>"><%`
`143`	`138`	`}`
`144`	`139`	`else`
`145`	`140`	`{`