Skip to content

Bugfix: Handle non-numeric oid query parameter in GetClassDefinitionForColumnConfigPayload #115

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
scrummer merged 1 commit into from
Sep 8, 2026
Merged

Bugfix: Handle non-numeric oid query parameter in GetClassDefinitionForColumnConfigPayload #115

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 3 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
# Changelog / Upgrade Notes

## 1.4.1
* Bugfix: Tolerate empty / non-integer `oid` query parameter in `getClassDefinitionForColumnConfig` (regression from #91) [#115](https://github.com/open-dxp/admin-bundle/pull/115)

## 1.4.0
* **New Feature**: Replace controller logic with dedicated handler and service classes (CQRS-Lite) [#91](https://github.com/open-dxp/admin-bundle/pull/91)
* New Feature: Add "use original recipients" option, fix resend and forward recipients [#102](https://github.com/open-dxp/admin-bundle/pull/102)
Expand Down
55 changes: 27 additions & 28 deletions public/js/opendxp/object/helpers/classTree.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
* @license https://www.gnu.org/licenses/gpl-3.0.html GNU General Public License version 3 (GPLv3)
*/

opendxp.registerNS("opendxp.object.helpers.classTree");
opendxp.registerNS('opendxp.object.helpers.classTree');
/**
* @private
*/
Expand Down Expand Up @@ -72,7 +72,7 @@ opendxp.object.helpers.classTree = Class.create({
);

var filterButton = new Ext.button.Button({
iconCls: "opendxp_icon_search"
iconCls: 'opendxp_icon_search'
});

var headerConfig = {
Expand All @@ -87,16 +87,16 @@ opendxp.object.helpers.classTree = Class.create({
title: t('class_attributes'),
iconCls: 'opendxp_icon_gridconfig_class_attributes',
tbar: headerConfig,
region: "center",
region: 'center',
autoScroll: true,
rootVisible: false,
bufferedRenderer: false,
animate: false,
width: 300,
root: {
id: "0",
id: '0',
root: true,
text: t("base"),
text: t('base'),
allowDrag: false,
leaf: true,
isTarget: true
Expand All @@ -106,7 +106,7 @@ opendxp.object.helpers.classTree = Class.create({
ptype: 'treeviewdragdrop',
enableDrag: true,
enableDrop: false,
ddGroup: "columnconfigelement"
ddGroup: 'columnconfigelement'
}
}
});
Expand All @@ -121,10 +121,10 @@ opendxp.object.helpers.classTree = Class.create({
});

filterField.on(
"keyup",
'keyup',
Ext.Function.createBuffered(this.updateFilter.bind(this, tree, filterField), 300)
);
filterButton.on("click", this.updateFilter.bind(this, tree, filterField));
filterButton.on('click', this.updateFilter.bind(this, tree, filterField));

return tree;
},
Expand All @@ -141,19 +141,19 @@ opendxp.object.helpers.classTree = Class.create({

var brickDescriptor = {};

if (data[keys[i]].nodeType == "objectbricks") {
if (data[keys[i]].nodeType == 'objectbricks') {
brickDescriptor = {
insideBrick: true,
brickType: data[keys[i]].nodeLabel,
brickField: data[keys[i]].brickField
};

text = t(data[keys[i]].nodeLabel) + " " + t("columns");
text = t(data[keys[i]].nodeLabel) + ' ' + t('columns');
}
var baseNode = {
type: "layout",
type: 'layout',
allowDrag: false,
iconCls: "opendxp_icon_" + data[keys[i]].nodeType,
iconCls: 'opendxp_icon_' + data[keys[i]].nodeType,
text: text,
originalText: text
};
Expand All @@ -162,7 +162,7 @@ opendxp.object.helpers.classTree = Class.create({
for (var j = 0; j < data[keys[i]].children.length; j++) {
baseNode.appendChild(this.recursiveAddNode(data[keys[i]].children[j], baseNode, brickDescriptor, this.config));
}
if (data[keys[i]].nodeType == "object") {
if (data[keys[i]].nodeType == 'object') {
baseNode.expand(true);
} else {
// baseNode.collapse();
Expand All @@ -177,18 +177,17 @@ opendxp.object.helpers.classTree = Class.create({
var fn = null;
var newNode = null;

if (con.fieldtype == "localizedfields") {
if (con.fieldtype == 'localizedfields') {
// create a copy because we have to pop this state
brickDescriptor = Ext.clone(brickDescriptor);
Ext.apply(brickDescriptor, {
insideLocalizedFields: true
});
}

if (con.datatype == "layout") {
if (con.datatype == 'layout') {
fn = this.addLayoutChild.bind(scope, con.fieldtype, con);
}
else if (con.datatype == "data") {
} else if (con.datatype == 'data') {
fn = this.addDataChild.bind(scope, con.fieldtype, con, this.showFieldName, brickDescriptor, config);
}

Expand Down Expand Up @@ -216,11 +215,11 @@ opendxp.object.helpers.classTree = Class.create({
}

var newNode = {
type: "layout",
type: 'layout',
expanded: true,
expandable: initData.children.length,
allowDrag: false,
iconCls: "opendxp_icon_" + type,
iconCls: 'opendxp_icon_' + type,
text: t(nodeLabel),
originalText: nodeLabel
};
Expand All @@ -231,12 +230,12 @@ opendxp.object.helpers.classTree = Class.create({
},

addDataChild: function (type, initData, showFieldname, brickDescriptor, config) {
if (type != "objectbricks" && (!initData.invisible || config.showInvisible)) {
if (type != 'objectbricks' && (!initData.invisible || config.showInvisible)) {
var isLeaf = true;
var draggable = true;

// localizedfields can be a drop target
if (type == "localizedfields") {
if (type == 'localizedfields') {
isLeaf = false;
draggable = false;
}
Expand All @@ -249,31 +248,31 @@ opendxp.object.helpers.classTree = Class.create({
containerKey: brickDescriptor.brickType,
fieldname: brickDescriptor.brickField,
brickfield: key
}
key = "?" + Ext.encode(parts) + "~" + key;
};
key = '?' + Ext.encode(parts) + '~' + key;
} else {
key = brickDescriptor.brickType + "~" + key;
key = brickDescriptor.brickType + '~' + key;
}
}

var text = t(initData.title);
if (showFieldname) {
if (brickDescriptor && brickDescriptor.insideBrick && brickDescriptor.insideLocalizedFields) {
text = text + "(" + brickDescriptor.brickType + "." + initData.name + ")";
text = text + '(' + brickDescriptor.brickType + '.' + initData.name + ')';
} else {
text = text + " (" + key.replace("~", ".") + ")";
text = text + ' (' + key.replace('~', '.') + ')';
}
}
var newNode = {
text: text,
key: key,
name: initData.name,
type: "data",
type: 'data',
layout: initData,
leaf: isLeaf,
allowDrag: draggable,
dataType: type,
iconCls: "opendxp_icon_" + type,
iconCls: 'opendxp_icon_' + type,
expanded: true,
brickDescriptor: brickDescriptor,
originalText: text
Expand Down
Loading
Loading