sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-03-08 04:58:40 +03:00
Code

r21095: Expose all naming contexts

Browse Source 
(This used to be commit d25e828dbe479347894b197c94199c5540ac34e5)
This commit is contained in:
Simo Sorce 2007-01-31 17:57:44 +00:00 committed by Gerald (Jerry) Carter
parent 18732ba952
commit 0a4617bd9f
2 changed files with 52 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
webapps/swat/source/class/swat/module/ldbbrowse/Fsm.js
View File

@ -78,7 +78,7 @@ qx.Proto.buildFsm = function(module)
"events" :
{
// If the search button is activated, issue a seacrh request
// If the search button is activated, issue a search request
"execute" :
{
"search" :
@ -200,7 +200,7 @@ qx.Proto.buildFsm = function(module)
if (parent == tree)
{
// ... then we want the defaultNamingContext, ...
attributes = [ "defaultNamingContext" ];
attributes = [ "defaultNamingContext", "namingContexts" ];
// ... and we want only base scope
scope = "base";

70
webapps/swat/source/class/swat/module/ldbbrowse/Gui.js
View File

@ -510,33 +510,63 @@ qx.Proto._displayTreeOpenResults = function(module, rpcRequest)
return;
}
for (var i = 0; i < result.length; i++)
{
var name;
// base object, add naming contexts to the root
if ((result.length == 1) &&
((result[0]["dn"] == "") ||
(result[0]["dn"].toLowerCase() == "cn=rootdse"))) {
child = result[i];
defnc = result[0]["defaultNamingContext"];
// Determine name for new tree row. If first level, use entire
// DN. Otherwise, strip off first additional component.
if (attributes == "defaultNamingContext")
{
name = child["defaultNamingContext"];
// Build a tree row for the defaultNamingContext
if (defnc) {
trs = qx.ui.treefullcontrol.TreeRowStructure.getInstance().standard(defnc);
// This row is a "folder" (it can have children)
t = new qx.ui.treefullcontrol.TreeFolder(trs);
t.setAlwaysShowPlusMinusSymbol(true);
// Add this row to its parent
parent.add(t);
}
else
var ncs = result[0]["namingContexts"];
// If it's multi-valued (type is an array) we have other naming contexts to show
if (typeof(ncs) == "object") {
for (var i = 0; i < ncs.length; i++) {
if (ncs[i] != defnc) { //skip default naming context
trs = qx.ui.treefullcontrol.TreeRowStructure.getInstance().standard(ncs[i]);
// This row is a "folder" (it can have children)
t = new qx.ui.treefullcontrol.TreeFolder(trs);
t.setAlwaysShowPlusMinusSymbol(true);
// Add this row to its parent
parent.add(t);
}
}
}
}
else {
for (var i = 0; i < result.length; i++)
{
//FIXME: must check for escapes, as ',' is also a valid value, not only a separator
var name;
child = result[i];
name = child["dn"].split(",")[0];
// Build a standard tree row
trs = qx.ui.treefullcontrol.TreeRowStructure.getInstance().standard(name);
// This row is a "folder" (it can have children)
t = new qx.ui.treefullcontrol.TreeFolder(trs);
t.setAlwaysShowPlusMinusSymbol(true);
// Add this row to its parent
parent.add(t);
}
// Build a standard tree row
trs = qx.ui.treefullcontrol.TreeRowStructure.getInstance().standard(name);
// This row is a "folder" (it can have children)
t = new qx.ui.treefullcontrol.TreeFolder(trs);
t.setAlwaysShowPlusMinusSymbol(true);
// Add this row to its parent
parent.add(t);
}
};