index 7c3ea972f196da4ad9516362ee8dc97ba85da3ac..7ec88be52a422b8b9b0f6de6c030477f7489c826 100644 (file)
// Fill objectTypes from departments and xml definition
$types = departmentManagement::get_support_departments();
foreach ($types as $class => $data) {
- $this->objectTypes[]= array("label" => $data['TITLE'],
+ $this->objectTypes[$data['OC']]= array("label" => $data['TITLE'],
"objectClass" => $data['OC'],
"image" => $data['IMG']);
}
$this->xmlData['definition']['objectType']= array($this->xmlData['definition']['objectType']);
}
foreach ($this->xmlData['definition']['objectType'] as $index => $otype) {
- $this->objectTypes[]= $this->xmlData['definition']['objectType'][$index];
+ $tmp = $this->xmlData['definition']['objectType'][$index];
+ $this->objectTypes[$tmp['objectClass']]= $tmp;
if (isset($this->xmlData['definition']['objectType'][$index]['category'])){
$this->categories[]= $otype['category'];
}
}
}
+ $this->objectTypes = array_values($this->objectTypes);
// Parse layout per column
$this->colprops= $this->parseLayout($this->xmlData['table']['layout']);
$checkAcl= "";
// Category or detailed permission?
- if (strpos('/', $module) === false) {
+ if (strpos($module, '/') !== false) {
if (preg_match('/([a-zA-Z0-9]+):([rwcdm]+)/', $sAcl, $m) ) {
$checkAcl= $ui->get_permissions($dn, $module, $m[1]);
$sAcl= $m[2];
// Populate base selector if already present
if ($this->baseSelector && $this->baseMode) {
$this->baseSelector->setBases($this->bases);
+ $this->baseSelector->update(TRUE);
}
}