Skip to content

[bot] Fast-forward for 25.10.0 #7127

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
github-actions merged 3 commits into from
Oct 15, 2025
Merged

[bot] Fast-forward for 25.10.0 #7127

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
235f768
disable all save buttons on form submit (#7095)
labkey-klum Oct 8, 2025
8943936
Merge 25.7 to 25.10
labkey-teamcity Oct 14, 2025
82a66b7
Issue 54094: escape form field names ending with "\" (#7121)
labkey-nicka Oct 14, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion api/src/org/labkey/api/query/QueryUpdateForm.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,8 +97,9 @@ else if (c == BACKSLASH)
sb.append(c);
}

// Issue 54094: Ensure it works when backslash is the last character
if (escaping)
throw new IllegalArgumentException("Invalid escape at end of encoded name: " + columnName);
sb.append(BACKSLASH);

return getTable().getColumn(sb.toString());
}
Expand Down
198 changes: 104 additions & 94 deletions issues/src/org/labkey/issue/view/updateView.jsp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
<%
/*
* Copyright (c) 2015-2019 LabKey Corporation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
/*
* Copyright (c) 2015-2019 LabKey Corporation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
%>
<%@ page import="org.labkey.api.data.ColumnInfo"%>
<%@ page import="org.labkey.api.data.Container"%>
Expand Down Expand Up @@ -155,101 +155,111 @@
%>

<script type="text/javascript" nonce="<%=getScriptNonce()%>">
function filterRe(e, input, re){
if (e.isSpecialKey())
return true;
(function($){

var cc = String.fromCharCode(e.getCharCode());
if (!cc)
return true;
onSubmit = function(){
$("input[name='dirty']").val(isDirty());
// Issue:53907, disable all submit buttons to prevent multiple submits
$('a[data-submitid]').addClass('labkey-disabled-button');

if (!re.test(cc))
{
if (e.stopPropagation) {
e.stopPropagation();
}
else {
e.cancelBubble = true;
}
if (e.preventDefault) {
e.preventDefault();
}
else {
e.returnValue = false;
}
return false;
}
LABKEY.setSubmit(true);
};

return true;
}
isDirty = function (){
let origNotify = <%=q(bean.getNotifyListString(false).toString())%>;
let notify = document.getElementById("notifyList");
if (notify && origNotify != notify.value)
return true;
return LABKEY.isDirty();
};

function filterCommaSepNumber(e, input) {
return filterRe(e, input, /^[\d,\s]+$/);
}
filterCommaSepNumber = function(e, input){
return filterRe(e, input, /^[\d,\s]+$/);
};

function onSubmit(){
(function($){
$("input[name='dirty']").val(isDirty());
LABKEY.setSubmit(true);
})(jQuery);
}
filterRe = function(e, input, re){
if (e.isSpecialKey())
return true;

(function($){
var cc = String.fromCharCode(e.getCharCode());
if (!cc)
return true;

var column1 = [];
var column2 = [];
var startColOneIdx = 11;
var startColTwoIdx = 21;
if (!re.test(cc))
{
if (e.stopPropagation) {
e.stopPropagation();
}
else {
e.cancelBubble = true;
}
if (e.preventDefault) {
e.preventDefault();
}
else {
e.returnValue = false;
}
return false;
}

<%
return true;
};

initialize = function(){
let startColOneIdx = 11;
let startColTwoIdx = 21;
// map of field name (lowercase) to tab index
let fieldMap = {
'title': 1,
'assignedto': 2,
'type': 3,
'area': 4,
'priority': 5,
'milestone': 6,
'comment': 7,
'resolution': 8,
'duplicate': 9,
'related': 10
};

// custom field mapping
<%
for (DomainProperty prop : column1Props)
{%>
column1.push(<%=q(ColumnInfo.legalNameFromName(prop.getName().toLowerCase()))%>);<%
fieldMap[<%=q(ColumnInfo.legalNameFromName(prop.getName()).toLowerCase())%>] = startColOneIdx++;<%
}
for (DomainProperty prop : column2Props)
{%>
column2.push(<%=q(ColumnInfo.legalNameFromName(prop.getName().toLowerCase()))%>);<%
}
%>

$(function() {
$("input[name='title']").attr("tabindex", "1").change(function(){LABKEY.setDirty(true);});
$("select[name='assignedTo']").attr("tabindex", "2").change(function(){LABKEY.setDirty(true);});
$("select[name='type']").attr("tabindex", "3").change(function(){LABKEY.setDirty(true);});
$("select[name='area']").attr("tabindex", "4").change(function(){LABKEY.setDirty(true);});
$("select[name='priority']").attr("tabindex", "5").change(function(){LABKEY.setDirty(true);});
$("select[name='milestone']").attr("tabindex", "6").change(function(){LABKEY.setDirty(true);});
$("textarea[name='comment']").attr("tabindex", "7").change(function(){LABKEY.setDirty(true);});
$("select[name='resolution']").attr("tabindex", "8").change(function(){LABKEY.setDirty(true);});
$("input[name='duplicate']").attr("tabindex", "9").change(function(){LABKEY.setDirty(true);});
$("input[name='related']").attr("tabindex", "10");

for (var i=0; i < column1.length; i++){
$("[name=" + column1[i] + "]").attr("tabindex", startColOneIdx++).change(function(){
LABKEY.setDirty(true);
});
}

for (i=0; i < column2.length; i++){
$("[name=" + column2[i] + "]").attr("tabindex", startColTwoIdx++).change(function(){
LABKEY.setDirty(true);
});
fieldMap[<%=q(ColumnInfo.legalNameFromName(prop.getName()).toLowerCase())%>] = startColTwoIdx++;<%
}
%>

registerEvents(fieldMap);
LABKEY.setDirty(<%=bean.isDirty()%>)
});
})(jQuery);

var origNotify = <%=q(bean.getNotifyListString(false).toString())%>;
};

// Add dirty tracking to form fields and set tab order
registerEvents = function(fieldMap){

$('.form-control').filter(function() {
let name = $(this).attr('name');
if (name) {
let nameLower = name.toLowerCase();
if (fieldMap.hasOwnProperty(nameLower)){
let inputSelect = '.form-control[name=' + name + ']';
$(inputSelect).attr("tabindex", fieldMap[nameLower]).on("change", function(){LABKEY.setDirty(true);});
}
}
return false;
});
};

function isDirty(){
var notify = document.getElementById("notifyList");
if (notify && origNotify != notify.value)
return true;
return LABKEY.isDirty();
}
LABKEY.Utils.onReady(function(){
initialize();
window.onbeforeunload = LABKEY.beforeunload(isDirty);
});

window.onbeforeunload = LABKEY.beforeunload(isDirty);
})(jQuery);

</script>
<labkey:form method="POST" onsubmit="onSubmit();" enctype="multipart/form-data" layout="horizontal">
Expand All @@ -268,7 +278,7 @@
%>
</table>
<div class="labkey-button-bar-separate">
<%= button("Save").submit(true).name(bean.getAction().name()).disableOnClick(true) %>
<%= button("Save").submit(true).name(bean.getAction().name()) %>
<%= button("Cancel").href(cancelURL).onClick("LABKEY.setSubmit(true);")%>
</div>
<table class="lk-fields-table" style="margin-top:10px;">
Expand Down Expand Up @@ -408,7 +418,7 @@
<tr><td><a href="#" id="filePickerLink"><img src="<%=getWebappURL("_images/paperclip.gif")%>">Attach a file</a></td></tr>
</table>
<div class="labkey-button-bar-separate" style="margin-bottom:10px">
<%= button("Save").submit(true).name(String.valueOf(bean.getAction())).disableOnClick(true) %>
<%= button("Save").submit(true).name(String.valueOf(bean.getAction())) %>
<%= button("Cancel").href(cancelURL).onClick("LABKEY.setSubmit(true);")%>
</div>
<% final Collection<IssueObject.CommentObject> comments = issue.getCommentObjects();
Expand Down