Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 3 additions & 3 deletions core/webapp/internal/ViewDesigner/FieldMetaStore.js
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ Ext4.define('LABKEY.internal.ViewDesigner.FieldMetaTreeStore', {
type: 'json',
root: 'columns',
idProperty: function(json) {
return json.fieldKeyPath.toUpperCase();
return encodeURI(json.fieldKeyPath.toUpperCase()); // Issue 53197
}
}
};
Expand Down Expand Up @@ -92,7 +92,7 @@ Ext4.define('LABKEY.internal.ViewDesigner.FieldMetaStore', {
type: 'json',
root: 'columns',
idProperty: function(json) {
return json.fieldKeyPath.toUpperCase();
return encodeURI(json.fieldKeyPath.toUpperCase()); // Issue 53197
}
}
};
Expand All @@ -109,7 +109,7 @@ Ext4.define('LABKEY.internal.ViewDesigner.FieldMetaStore', {
getById : function(id) {
var _id;
if (Ext4.isString(id)) {
_id = id.toUpperCase();
_id = encodeURI(id.toUpperCase()); // Issue 53197
}
else {
_id = id;
Expand Down
8 changes: 4 additions & 4 deletions core/webapp/internal/ViewDesigner/tab/BaseTab.js
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,11 @@ Ext4.define('LABKEY.internal.ViewDesigner.model.FieldKey', {
mapping: 'fieldKey',
convert : function(fieldKey, rec) {
if (Ext4.isString(fieldKey)) {
return fieldKey.toUpperCase();
return encodeURI(fieldKey.toUpperCase()); // Issue 53197
}

if (rec && rec.raw && Ext4.isString(rec.raw.fieldKey)) {
return rec.raw.fieldKey.toUpperCase();
return encodeURI(rec.raw.fieldKey.toUpperCase()); // Issue 53197
}

throw new Error('LABKEY.internal.ViewDesigner.model.FieldKey: unable to generate id due to missing fieldKey.');
Expand All @@ -30,7 +30,7 @@ Ext4.define('LABKEY.internal.ViewDesigner.model.FieldKey', {
getById: function(id) {
var _id;
if (Ext4.isString(id)) {
_id = id.toUpperCase();
_id = encodeURI(id.toUpperCase()); // Issue 53197
}
else {
_id = id;
Expand All @@ -51,7 +51,7 @@ Ext4.define('LABKEY.internal.ViewDesigner.store.FieldKey', {
getById: function(id) {
var _id;
if (Ext4.isString(id)) {
_id = id.toUpperCase();
_id = encodeURI(id.toUpperCase()); // Issue 53197
}
else {
_id = id;
Expand Down