yetangitu/lam
1
0
Fork 0
mirror of https://github.com/LDAPAccountManager/lam.git synced 2025-10-03 09:49:16 +02:00
Code Issues Releases Wiki Activity

#268 added wunderbaum 0.12.0

Browse source
This commit is contained in:
Roland Gruber 2025-02-12 20:52:26 +01:00
parent a010e943bc
commit ec6502e152
2 changed files with 20 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

6
lam/templates/lib/500_lam.js
View file

@ -2938,13 +2938,17 @@ window.lam.treeview.openInitial = async function (tree, ids) {
if (ids.length === 0) { if (ids.length === 0) {
return; return;
} }
let lastNode = null;
for (const id of ids) { for (const id of ids) {
const node = tree.findKey(id); const node = tree.findKey(id);
if (node) { if (node) {
await node.setExpanded(); await node.setExpanded();
await node.setActive(); lastNode = node;
} }
} }
if (lastNode) {
await lastNode.setActive();
}
} }
/** /**

46
lam/templates/tools/treeView.php
View file

@ -75,7 +75,7 @@ function showTree(): void {
$initialDn = base64_decode($_GET['dn']); $initialDn = base64_decode($_GET['dn']);
$roots = TreeViewTool::getRootDns(); $roots = TreeViewTool::getRootDns();
foreach ($roots as $rootDn) { foreach ($roots as $rootDn) {
if ((strlen($initialDn) > strlen($rootDn)) && substr($initialDn, -1 * strlen($rootDn)) === $rootDn) { if ((strlen($initialDn) > strlen($rootDn)) && str_ends_with($initialDn, $rootDn)) {
$extraDnPart = substr($initialDn, 0, (-1 * strlen($rootDn)) - 1); $extraDnPart = substr($initialDn, 0, (-1 * strlen($rootDn)) - 1);
$dnParts = ldap_explode_dn($extraDnPart, 0); $dnParts = ldap_explode_dn($extraDnPart, 0);
if ($dnParts !== false) { if ($dnParts !== false) {
@ -99,34 +99,14 @@ function showTree(): void {
var maxHeight = document.documentElement.scrollHeight - (document.querySelector("#ldap_tree").getBoundingClientRect().top - window.scrollY) - 50; var maxHeight = document.documentElement.scrollHeight - (document.querySelector("#ldap_tree").getBoundingClientRect().top - window.scrollY) - 50;
document.getElementById("ldap_tree").style.maxHeight = maxHeight; document.getElementById("ldap_tree").style.maxHeight = maxHeight;
document.getElementById("ldap_actionarea").style.maxHeight = maxHeight; document.getElementById("ldap_actionarea").style.maxHeight = maxHeight;
/*jQuery(\'#ldap_tree\').jstree({
"plugins": [
"changed"
],
"core": {
"worker": false,
"strings": {
"Loading ...": "' . _('Loading') . '"
},
"data": function(node, callback) {
window.lam.treeview.getNodes("' . getSecurityTokenName() . '", "' . getSecurityTokenValue() . '", node, callback);
}
}
})
.on("changed.jstree", function (e, data) {
if (data && data.action && (data.action == "select_node")) {
var node = data.node;
window.lam.treeview.getNodeContent("' . getSecurityTokenName() . '", "' . getSecurityTokenValue() . '", node.id);
}
})
.on("ready.jstree", function (e, data) {
var tree = jQuery.jstree.reference("#ldap_tree");
window.lam.treeview.openInitial(tree, ' . $openInitialJsArray . ');
});*/
const tree = new mar10.Wunderbaum({ const tree = new mar10.Wunderbaum({
element: document.getElementById("ldap_tree"), element: document.getElementById("ldap_tree"),
id: "ldap_tree", id: "ldap_tree",
strings: {
loading: "' . addslashes(_('Loading')) . '",
loadError: "' . addslashes(_('Error')) . '",
noData: "' . addslashes(_('No objects found!')) . '"
},
debugLevel: 2, debugLevel: 2,
source: "../misc/ajax.php?function=treeview&command=getRootNodes", source: "../misc/ajax.php?function=treeview&command=getRootNodes",
init: (e) => { init: (e) => {
@ -136,27 +116,31 @@ function showTree(): void {
lazyLoad: function(e) { lazyLoad: function(e) {
return {url: "../misc/ajax.php?function=treeview&command=getNodes&dn=" + e.node.key}; return {url: "../misc/ajax.php?function=treeview&command=getNodes&dn=" + e.node.key};
}, },
activate: function(e) {
const node = e.node;
window.lam.treeview.getNodeContent("' . getSecurityTokenName() . '", "' . getSecurityTokenValue() . '", node.key);
}
}); });
}); });
'); ');
$row->add($treeScript, 12); $row->add($treeScript);
$deleteDialogContent = new htmlResponsiveRow(); $deleteDialogContent = new htmlResponsiveRow();
$deleteDialogContent->add(new htmlOutputText(_('Do you really want to delete this entry?')), 12); $deleteDialogContent->add(new htmlOutputText(_('Do you really want to delete this entry?')));
$deleteDialogContent->addVerticalSpacer('0.5rem'); $deleteDialogContent->addVerticalSpacer('0.5rem');
$deleteDialogEntryText = new htmlOutputText(''); $deleteDialogEntryText = new htmlOutputText('');
$deleteDialogEntryText->setCSSClasses(['treeview-delete-entry']); $deleteDialogEntryText->setCSSClasses(['treeview-delete-entry']);
$deleteDialogContent->add($deleteDialogEntryText, 12); $deleteDialogContent->add($deleteDialogEntryText);
$deleteDialogDiv = new htmlDiv('treeview_delete_dlg', $deleteDialogContent, ['hidden']); $deleteDialogDiv = new htmlDiv('treeview_delete_dlg', $deleteDialogContent, ['hidden']);
$row->add($deleteDialogDiv); $row->add($deleteDialogDiv);
$errorDialogContent = new htmlResponsiveRow(); $errorDialogContent = new htmlResponsiveRow();
$errorDialogEntryTitle = new htmlOutputText(''); $errorDialogEntryTitle = new htmlOutputText('');
$errorDialogEntryTitle->setCSSClasses(['treeview-error-title']); $errorDialogEntryTitle->setCSSClasses(['treeview-error-title']);
$errorDialogContent->add($errorDialogEntryTitle, 12); $errorDialogContent->add($errorDialogEntryTitle);
$errorDialogEntryText = new htmlOutputText(''); $errorDialogEntryText = new htmlOutputText('');
$errorDialogEntryText->setCSSClasses(['treeview-error-text']); $errorDialogEntryText->setCSSClasses(['treeview-error-text']);
$errorDialogContent->add($errorDialogEntryText, 12); $errorDialogContent->add($errorDialogEntryText);
$errorDialogDiv = new htmlDiv('treeview_error_dlg', $errorDialogContent, ['hidden']); $errorDialogDiv = new htmlDiv('treeview_error_dlg', $errorDialogContent, ['hidden']);
$row->add($errorDialogDiv); $row->add($errorDialogDiv);