Skip to content

Prevent passing rid on scratch user creation #109

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 2 commits into from
Aug 24, 2026
Merged

Prevent passing rid on scratch user creation #109

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
dc2a5e7
Refactor reference ID handling: use `getInt()` method and conditional…
scrummer Aug 24, 2026
1239b6a
some cleanup
scrummer Aug 24, 2026
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
39 changes: 21 additions & 18 deletions public/js/opendxp/settings/user/panels/abstract.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
*/


opendxp.registerNS("opendxp.settings.user.panels.abstract");
opendxp.registerNS('opendxp.settings.user.panels.abstract');
/**
* @private
*/
Expand All @@ -37,10 +37,10 @@ opendxp.settings.user.panels.abstract = Class.create({

getTreeNodeListeners: function () {
var treeNodeListeners = {
'itemclick' : this.onTreeNodeClick.bind(this),
'itemclick': this.onTreeNodeClick.bind(this),
'itemcontextmenu': this.onTreeNodeContextmenu.bind(this),
'beforeitemappend': function (thisNode, newChildNode, index, eOpts) {
newChildNode.data.qtip = t('id') + ": " + newChildNode.data.id;
newChildNode.data.qtip = t('id') + ': ' + newChildNode.data.id;
}
};

Expand All @@ -51,20 +51,20 @@ opendxp.settings.user.panels.abstract = Class.create({
remove: function (tree, record) {

Ext.MessageBox.show({
title:t('delete'),
msg: record.hasChildNodes() ? t("are_you_sure_recursive") : sprintf(t("delete_message_advanced"), t('user'), record.data.text),
buttons: Ext.Msg.OKCANCEL ,
title: t('delete'),
msg: record.hasChildNodes() ? t('are_you_sure_recursive') : sprintf(t('delete_message_advanced'), t('user'), record.data.text),
buttons: Ext.Msg.OKCANCEL,
icon: record.hasChildNodes() ? Ext.MessageBox.WARNING : Ext.MessageBox.QUESTION,
fn: function (button) {
if (button == "ok") {
if (button == 'ok') {
Ext.Ajax.request({
url: Routing.generate('opendxp_admin_user_delete'),
method: 'DELETE',
params: {
id: record.data.id
},
success: function() {
var userPanelKey = "user_" + record.data.id;
success: function () {
var userPanelKey = 'user_' + record.data.id;
if (this.panels[userPanelKey]) {
this.panels[userPanelKey].panel.close();
delete this.panels[userPanelKey];
Expand All @@ -83,22 +83,25 @@ opendxp.settings.user.panels.abstract = Class.create({
rid = cloneRecord.data.id;
parentNode = cloneRecord.parentNode;
} else {
rid = 0;
rid = null;
parentNode = selectedRecord;
}
var pid = parentNode.data.id;
Ext.MessageBox.prompt(t('add'), t('enter_the_name_of_the_new_item'), function (button, value, object) {
if(button=='ok' && value != ''){
if (button == 'ok' && value != '') {
var params = {
parentId: pid,
type: type,
name: value,
active: true
};
if (rid !== null) {
params.rid = rid;
}
Ext.Ajax.request({
url: Routing.generate('opendxp_admin_user_add'),
method: 'POST',
params: {
parentId: pid,
type: type,
name: value,
active: true,
rid: rid
},
params: params,
success: this.addComplete.bind(this, parentNode)
});
}
Expand Down
2 changes: 1 addition & 1 deletion src/Handler/User/AddUser/AddUserPayload.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ public function __construct(
public static function fromRequest(Request $request): static
{
$name = $request->request->get('name', '');
$referenceId = $request->request->has('rid') ? (int) $request->request->get('rid') : null;
$referenceId = $request->request->getInt('rid') ?: null;
$type = $request->request->get('type');

return new static(
Expand Down
Loading