From: hickert Date: Mon, 22 May 2006 07:53:23 +0000 (+0000) Subject: Added baseACL && baseSelect Dialog icon X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=feaebb942db33bf1b0c39b4b1a633994b4992b21;p=gosa.git Added baseACL && baseSelect Dialog icon git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@3483 594d385d-05f5-0310-b6e9-bd551577e9d8 --- diff --git a/plugins/admin/systems/class_componentGeneric.inc b/plugins/admin/systems/class_componentGeneric.inc index ff0aa7d81..7d1e3fe86 100644 --- a/plugins/admin/systems/class_componentGeneric.inc +++ b/plugins/admin/systems/class_componentGeneric.inc @@ -86,6 +86,7 @@ class componentGeneric extends plugin $smarty->assign("$attr", $this->$attr); } $smarty->assign("base_select", $this->base); + $smarty->assign("baseACL", chkacl($this->acl,"base")); /* Show main page */ $smarty->assign("netconfig", $this->netConfigDNS->execute()); diff --git a/plugins/admin/systems/class_phoneGeneric.inc b/plugins/admin/systems/class_phoneGeneric.inc index 9e602ba28..24566d9f2 100644 --- a/plugins/admin/systems/class_phoneGeneric.inc +++ b/plugins/admin/systems/class_phoneGeneric.inc @@ -220,6 +220,7 @@ class phoneGeneric extends plugin $smarty->assign($attr."ACL", chkacl($this->acl, $attr)); } $smarty->assign("base_select", $this->base); + $smarty->assign("baseACL", chkacl($this->acl,"base")); $smarty->assign("goFonDefaultIPs",array("dynamic"=>_("dynamic"),"network"=>_("Networksettings"))); diff --git a/plugins/admin/systems/class_printGeneric.inc b/plugins/admin/systems/class_printGeneric.inc index 678c6d834..b5fc45341 100644 --- a/plugins/admin/systems/class_printGeneric.inc +++ b/plugins/admin/systems/class_printGeneric.inc @@ -349,6 +349,8 @@ class printgeneric extends plugin $smarty->assign("$attr", $this->$attr); } + $smarty->assign("baseACL", chkacl($this->acl,"base")); + if(isset($_POST['AddUser'])){ $this->dialog = new selectUserToPrinterDialog($this->config, get_userinfo(),"AddUser"); } diff --git a/plugins/admin/systems/class_servGeneric.inc b/plugins/admin/systems/class_servGeneric.inc index 7679c72e2..a28ed75b7 100644 --- a/plugins/admin/systems/class_servGeneric.inc +++ b/plugins/admin/systems/class_servGeneric.inc @@ -136,6 +136,8 @@ class servgeneric extends plugin $smarty->assign($attr."ACL", chkacl($this->acl, $attr)); $smarty->assign("$attr", $this->$attr); } + $smarty->assign("baseACL", chkacl($this->acl, "base")); + $smarty->assign("staticAddress", ""); $smarty->assign("base_select", $this->base); diff --git a/plugins/admin/systems/component.tpl b/plugins/admin/systems/component.tpl index 14f80c4a7..271d24790 100644 --- a/plugins/admin/systems/component.tpl +++ b/plugins/admin/systems/component.tpl @@ -12,10 +12,15 @@ {$must} - {html_options options=$bases selected=$base_select} - + {if $baseACL == ""} + + {else} + + {/if} + diff --git a/plugins/admin/systems/phone.tpl b/plugins/admin/systems/phone.tpl index 105e87f0d..d8172cf63 100644 --- a/plugins/admin/systems/phone.tpl +++ b/plugins/admin/systems/phone.tpl @@ -12,10 +12,15 @@ {$must} - {html_options options=$bases selected=$base_select} - - + + {if $baseACL == ""} + + {else} + + {/if} + diff --git a/plugins/admin/systems/printer.tpl b/plugins/admin/systems/printer.tpl index 994e87ceb..a7582b45d 100644 --- a/plugins/admin/systems/printer.tpl +++ b/plugins/admin/systems/printer.tpl @@ -19,10 +19,15 @@ {$must} - {html_options options=$bases selected=$base_select} - + {if $baseACL == ""} + + {else} + + {/if} + diff --git a/plugins/admin/systems/server.tpl b/plugins/admin/systems/server.tpl index c9446e096..b89c73ad9 100644 --- a/plugins/admin/systems/server.tpl +++ b/plugins/admin/systems/server.tpl @@ -14,10 +14,15 @@
{$must}
- {html_options options=$bases selected=$base_select} - + {if $baseACL == ""} + + {else} + + {/if} + diff --git a/plugins/admin/systems/terminal.tpl b/plugins/admin/systems/terminal.tpl index fc29ba407..152c9dc19 100644 --- a/plugins/admin/systems/terminal.tpl +++ b/plugins/admin/systems/terminal.tpl @@ -16,10 +16,15 @@ {$must} - {html_options options=$bases selected=$base_select} - + {if $baseACL == ""} + + {else} + + {/if} + diff --git a/plugins/admin/systems/workstation.tpl b/plugins/admin/systems/workstation.tpl index a320b0dd2..b48817dd7 100644 --- a/plugins/admin/systems/workstation.tpl +++ b/plugins/admin/systems/workstation.tpl @@ -22,10 +22,14 @@ {$must} - {html_options options=$bases selected=$base_select} - + {if $baseACL == ""} + + {else} + + {/if}