diff --git a/gosa-core/plugins/admin/departments/class_departmentManagement.inc b/gosa-core/plugins/admin/departments/class_departmentManagement.inc
index adf3ee14d37c42c1e5eeb5da3eada458bcf4026b..79ec8eb4fbe3a89167fe106d6700f61c8f83b53d 100644 (file)
class departmentManagement extends management
{
class departmentManagement extends management
{
- var $plHeadline = "Departments";
- var $plDescription = "Manage Departments";
+ var $plHeadline = "Directory structure";
+ var $plDescription = "Manage organizations, organizational units, localities, countries and more";
var $plIcon = "plugins/departments/images/plugin.png";
// Tab definition
protected $tabClass = "deptabs";
protected $tabType = "DEPTABS";
var $plIcon = "plugins/departments/images/plugin.png";
// Tab definition
protected $tabClass = "deptabs";
protected $tabType = "DEPTABS";
- protected $aclCategory = "departement";
+ protected $aclCategory = "department";
protected $aclPlugin = "generic";
protected $objectName = "department";
protected $aclPlugin = "generic";
protected $objectName = "department";
$this->setFilter($filter);
// Add copy&paste and snapshot handler.
$this->setFilter($filter);
// Add copy&paste and snapshot handler.
- if ($this->config->boolValueIsTrue("main", "copyPaste")){
+ if ($this->config->boolValueIsTrue("core", "copyPaste")){
$this->cpHandler = new CopyPasteHandler($this->config);
}
$this->cpHandler = new CopyPasteHandler($this->config);
}
- if($this->config->get_cfg_value("enableSnapshots") == "true"){
+ if($this->config->get_cfg_value("core","enableSnapshots") == "true"){
$this->snapHandler = new SnapshotHandler($this->config);
}
$this->snapHandler = new SnapshotHandler($this->config);
}
$str = management::saveChanges();
if(!empty($str)) return($str);
$str = management::saveChanges();
if(!empty($str)) return($str);
+ $plugname = (isset($this->last_tabObject->base_name))? $this->last_tabObject->base_name : '';
+
$this->refreshDeps();
$this->refreshDeps();
- $plugname = $this->last_tabObject->base_name;
- if($this->last_tabObject->by_object[$plugname]->must_be_tagged()){
+ if(isset($this->last_tabObject->by_object[$plugname]) &&
+ is_object($this->last_tabObject->by_object[$plugname]) &&
+ $this->last_tabObject->by_object[$plugname]->must_be_tagged()){
$smarty = get_smarty();
$smarty->assign("src","?plug=".$_GET['plug']."&TagDepartment&no_output_compression");
$smarty->assign("message",_("As soon as the tag operation has finished, you can scroll down to end of the page and press the 'Continue' button to continue with the department management dialog."));
$smarty = get_smarty();
$smarty->assign("src","?plug=".$_GET['plug']."&TagDepartment&no_output_compression");
$smarty->assign("message",_("As soon as the tag operation has finished, you can scroll down to end of the page and press the 'Continue' button to continue with the department management dialog."));
static function filterDepLabel($row,$dn,$params,$ou,$pid,$base)
{
$ou = $ou[0];
static function filterDepLabel($row,$dn,$params,$ou,$pid,$base)
{
$ou = $ou[0];
- if($dn == $base){
+ if(LDAP::convert($dn) == $base){
$ou =".";
}
$dn= LDAP::fix(func_get_arg(1));
$ou =".";
}
$dn= LDAP::fix(func_get_arg(1));
// Finally remove departments and update departmnet browsers
// Finally remove departments and update departmnet browsers
- function removeEntryConfirmed($action="",$target=array(),$all=array(),$altTabClass="",$altTabType="",$altAclCategory="")
+ function removeEntryConfirmed($action="",$target=array(),$all=array(),$altTabClass="",
+ $altTabType="",$altAclCategory="", $aclPlugin="")
{
management::removeEntryConfirmed($action,$target,$all, $altTabClass,$altTabType,$altAclCategory);
$this->refreshDeps();
{
management::removeEntryConfirmed($action,$target,$all, $altTabClass,$altTabType,$altAclCategory);
$this->refreshDeps();