From: hickert Date: Mon, 27 Feb 2006 13:27:49 +0000 (+0000) Subject: Updated Base selection X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=e4e20d6f38ae21573365a178882e762bce4e3f96;p=gosa.git Updated Base selection git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@2749 594d385d-05f5-0310-b6e9-bd551577e9d8 --- diff --git a/plugins/personal/generic/class_user.inc b/plugins/personal/generic/class_user.inc index 7d6c7c51e..1d3e4d4d1 100644 --- a/plugins/personal/generic/class_user.inc +++ b/plugins/personal/generic/class_user.inc @@ -272,9 +272,13 @@ class user extends plugin } /* Base select dialog */ - if(isset($_POST['chooseBase'])){ - $this->dialog = new baseSelectDialog($this->config,$this->allowedBasesToMoveTo()); - $this->dialog->setCurrentBase($this->base); + $once = true; + foreach($_POST as $name => $value){ + if(preg_match("/^chooseBase/",$name) && $once){ + $once = false; + $this->dialog = new baseSelectDialog($this->config,$this->allowedBasesToMoveTo()); + $this->dialog->setCurrentBase($this->base); + } } /* Dialog handling */ @@ -465,7 +469,7 @@ class user extends plugin /* Show us the edit screen */ @$smarty->assign("bases", $this->allowedBasesToMoveTo()); # $smarty->assign("bases", $this->config->idepartments); - $smarty->assign("base_select", trim($this->config->idepartments[$this->base])); + $smarty->assign("base_select", $this->base); $smarty->assign("selectmode", chkacl($this->acl, "create")); $smarty->assign("certificatesACL", chkacl($this->acl, "certificates")); $smarty->assign("jpegPhotoACL", chkacl($this->acl, "jpegPhoto")); diff --git a/plugins/personal/generic/generic.tpl b/plugins/personal/generic/generic.tpl index d8bbab58f..1af32ea6b 100644 --- a/plugins/personal/generic/generic.tpl +++ b/plugins/personal/generic/generic.tpl @@ -110,13 +110,10 @@
- - {$base_select} - +