yetangitu/lam
1
0
Fork 0
mirror of https://github.com/LDAPAccountManager/lam.git synced 2025-10-03 17:59:21 +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:35:48 +01:00
parent 90c0d4e9aa
commit a010e943bc
4 changed files with 16 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

2
lam/lib/treeview.inc
View file

@ -1656,7 +1656,7 @@ class TreeView {
* @return int result * @return int result
*/ */
function compareNodeByIdAsDn($a, $b): int { function compareNodeByIdAsDn($a, $b): int {
return strnatcasecmp(extractRDN(base64_decode($a['id'])), extractRDN(base64_decode($b['id']))); return strnatcasecmp(extractRDN(base64_decode($a['key'])), extractRDN(base64_decode($b['key'])));
} }
/** /**

4
lam/style/500_layout.css
View file

@ -948,6 +948,10 @@ i.wb-icon {
margin-right: 5px; margin-right: 5px;
} }
:root {
--wb-node-text-color: var(--lam-text-color-default) !important;
}
div.swal2-html-container { div.swal2-html-container {
overflow: visible; overflow: visible;
} }

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

@ -2934,16 +2934,16 @@ window.lam.treeview.searchResults = function (event, tokenName, tokenValue, dn)
* @param tree tree object * @param tree tree object
* @param ids array of node IDs. * @param ids array of node IDs.
*/ */
window.lam.treeview.openInitial = function(tree, ids) { window.lam.treeview.openInitial = async function (tree, ids) {
if (ids.length === 0) { if (ids.length === 0) {
return; return;
} }
const firstNodeId = ids.shift(); for (const id of ids) {
tree.open_node(firstNodeId, function() { const node = tree.findKey(id);
window.lam.treeview.openInitial(tree, ids); if (node) {
}); await node.setExpanded();
if (ids.length === 0) { await node.setActive();
tree.select_node(firstNodeId); }
} }
} }

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

@ -129,10 +129,10 @@ function showTree(): void {
id: "ldap_tree", id: "ldap_tree",
debugLevel: 2, debugLevel: 2,
source: "../misc/ajax.php?function=treeview&command=getRootNodes", source: "../misc/ajax.php?function=treeview&command=getRootNodes",
// Event handlers: init: (e) => {
/*init: (e) => { tree.expandAll(true, {depth: 1, });
//window.lam.treeview.openInitial(tree, ' . $openInitialJsArray . '); window.lam.treeview.openInitial(tree, ' . $openInitialJsArray . ');
},*/ },
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};
}, },