We've to enforce password set after apply&&cancel too

git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@14991 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 00d63536665f531adf1b04c92cdbfe17aab96a3f..eba470ebf957eaf0db7aaef90fe6bf16e83afd72 100644 (file)
--- a/gosa-core/plugins/admin/users/class_userManagement.inc
+++ b/gosa-core/plugins/admin/users/class_userManagement.inc
@@ -302,6 +302,17 @@ class userManagement extends management
     }
   }
 
+  function cancelEdit()
+  {
+    management::cancelEdit();
+
+    if(isset($this->last_tabObject->by_object['user']) && $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());
+    }
+  }
+
 
   /*! \brief  Intiates user creation. 
    *          If we've user templates, then the user will be asked to use to use one.