From: hickert Date: Tue, 19 Sep 2006 04:05:14 +0000 (+0000) Subject: Added acl_get_base X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=59575a53c1b13736bcfb9ee6c2c65746ab99effe;p=gosa.git Added acl_get_base git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@4715 594d385d-05f5-0310-b6e9-bd551577e9d8 --- diff --git a/plugins/admin/systems/class_workstationGeneric.inc b/plugins/admin/systems/class_workstationGeneric.inc index 0cd3d3191..8f31136e5 100644 --- a/plugins/admin/systems/class_workstationGeneric.inc +++ b/plugins/admin/systems/class_workstationGeneric.inc @@ -194,7 +194,7 @@ class workgeneric extends plugin foreach($_POST as $name => $value){ if(preg_match("/^chooseBase/",$name) && $once && $this->acl_is_writeable("base")){ $once = false; - $this->dialog = new baseSelectDialog($this->config,$this); + $this->dialog = new baseSelectDialog($this->config,$this,$this->acl_get_bases()); $this->dialog->setCurrentBase($this->base); } } @@ -244,7 +244,7 @@ class workgeneric extends plugin $smarty->assign("cn", $this->cn); $smarty->assign("l", $this->l); - $smarty->assign("bases", $this->config->idepartments); + $smarty->assign("bases", $this->acl_get_bases()); $smarty->assign("staticAddress", ""); $tmp = array(); @@ -338,10 +338,6 @@ class workgeneric extends plugin $this->is_modified= TRUE; } } - }else{ - - print_red(sprintf(_("You are not allowed to move this object to '%s'."),LDAP::fix($_POST['base']))); - $this->set_acl_base('dummy,'.$this->base); } } $this->netConfigDNS->save_object(); diff --git a/plugins/admin/systems/workstation.tpl b/plugins/admin/systems/workstation.tpl index 317d7e219..378c7c126 100644 --- a/plugins/admin/systems/workstation.tpl +++ b/plugins/admin/systems/workstation.tpl @@ -25,8 +25,15 @@ {$must} - base . base . - base . base . base . base . + +{render acl=$baseACL} + +{/render} +{render acl=$baseACL disable_picture='images/folder_gray.png'} + +{/render}