From f3e54e20273d3d66f2829bfedc0c4f046c4ad76f Mon Sep 17 00:00:00 2001 From: hickert Date: Tue, 2 Aug 2005 12:59:31 +0000 Subject: [PATCH] Added other picture if department contains additional departments git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@1049 594d385d-05f5-0310-b6e9-bd551577e9d8 --- TODO | 5 ----- .../departments/class_departmentManagement.inc | 13 +++++++++++-- 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/TODO b/TODO index 32448096d..bd2cf9a53 100644 --- a/TODO +++ b/TODO @@ -7,19 +7,14 @@ Things to fix before 2.4: * Fix problem with winstation and invalid structural object class chain (inetOrgPerson/device) * Deparment dialog - - adapt base when creating a new department - - show different symbol when the department contains subdepartments * User dialog - - adapt base when creating a new user/template - Add button for template created users * Systems dialog - Add buttons for all system types - - Filter is broken * All dialogs - - adapt base when creating a new entity - cleanup, remove not used code fragments -   between pictures ... if needed (convert_list ? ) - ALT not translated diff --git a/plugins/admin/departments/class_departmentManagement.inc b/plugins/admin/departments/class_departmentManagement.inc index 79f1807a1..b461d6b5e 100644 --- a/plugins/admin/departments/class_departmentManagement.inc +++ b/plugins/admin/departments/class_departmentManagement.inc @@ -302,14 +302,23 @@ class departmentManagement extends plugin array("string"=>_("Department name")), array("string" =>_("Actions"), "attach" => "style='text-align: right;border:none'"))); + foreach($this->departments as $key => $val) { if(!isset($this->config->departments[trim($key)])){ $this->config->departments[trim($key)]=""; } + + $non_empty=""; + $keys= str_replace("/","\/",$key); + foreach($this->config->departments as $keyd=>$vald ){ + if(preg_match("/".$keys."\/.*/",$keyd)){ + $non_empty="full"; + } + } + $title = $this->config->departments[$key]; - - $field0 = array("string" => "department","attach"=>"style='width:20px;'"); + $field0 = array("string" => "department","attach"=>"style='width:20px;'"); $field1 = array("string" => sprintf($linkopen,base64_encode($key),$val), "attach" => "style='width:100%' title='".$title."'"); $field2 = array("string" => preg_replace("/%KEY%/", base64_encode($key), $actions),"attach"=>"style='text-align:right;border:none'"); -- 2.30.2