From: hickert <hickert@594d385d-05f5-0310-b6e9-bd551577e9d8>
Date: Mon, 4 Jan 2010 08:30:07 +0000 (+0000)
Subject: Fixed 818, closes #818
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=efb6d61175429262615f44916335328ee201342e;p=gosa.git

Fixed 818, closes #818
-Do not display template list when creating users, while no templates are available.


git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@14993 594d385d-05f5-0310-b6e9-bd551577e9d8
---

diff --git a/gosa-core/plugins/admin/users/class_userManagement.inc b/gosa-core/plugins/admin/users/class_userManagement.inc
index eba470ebf..67b0f6c9c 100644
--- a/gosa-core/plugins/admin/users/class_userManagement.inc
+++ b/gosa-core/plugins/admin/users/class_userManagement.inc
@@ -306,7 +306,9 @@ class userManagement extends management
   {
     management::cancelEdit();
 
-    if(isset($this->last_tabObject->by_object['user']) && $this->last_tabObject->by_object['user']->password_change_needed()){
+    if(isset($this->last_tabObject->by_object['user']) && 
+        $this->last_tabObject->by_object['user']->dn != "new" &&  
+        $this->last_tabObject->by_object['user']->password_change_needed()){
       $this->force_hash_type[$this->last_tabObject->dn] = $this->last_tabObject->by_object['user']->pw_storage;
       $this->pwd_change_queue[] = $this->last_tabObject->dn;
       return($this->handlePasswordQueue());
@@ -365,7 +367,7 @@ class userManagement extends management
     $templates = array_merge($templates,$this->get_templates());
 
     // Display template selection
-    if (count($templates)){
+    if (count($templates) > 1){
       $smarty = get_smarty();
   
       // Set default variables, normally empty.