Miscellaneous minor updates

This commit is contained in:
Deon George
2009-08-28 20:07:56 +10:00
parent 52fbd24b2c
commit 9cb27e3a70
10 changed files with 23 additions and 20 deletions

View File

@@ -112,10 +112,10 @@ function includeHTML(component,html) {
if (scripts[i].attributes.length > 0) {
for (var j in scripts[i].attributes) {
if (typeof(scripts[i].attributes[j]) != 'undefined'
&& typeof(scripts[i].attributes[j].nodeName) != 'undefined'
&& scripts[i].attributes[j].nodeValue != null
&& scripts[i].attributes[j].nodeValue != '') {
scriptclone.setAttribute(scripts[i].attributes[j].nodeName,scripts[i].attributes[j].nodeValue);
&& typeof(scripts[i].attributes[j].nodeName) != 'undefined'
&& scripts[i].attributes[j].nodeValue != null
&& scripts[i].attributes[j].nodeValue != '') {
scriptclone.setAttribute(scripts[i].attributes[j].nodeName,scripts[i].attributes[j].nodeValue);
}
}
}

View File

@@ -30,7 +30,7 @@ if (get_request('purge','REQUEST')) {
$entry = $tree->getEntry($value);
}
$tree->readChildren($value);
$tree->readChildren($value,true);
$entry->open();
}

View File

@@ -110,7 +110,7 @@ if (count($request['template']->getLDAPmodify(true))) {
$input_disabled = '';
$input_onclick = '';
if ($attribute->isForceDelete() || in_array($attribute->getName(),$mustattrs))
if ($attribute->isForceDelete() || (in_array($attribute->getName(),$mustattrs)) && $request['template']->getAttribute('objectclass')->justModified())
$input_disabled = 'disabled="disabled"';
if ($attribute->getName() == 'objectclass') {