Removed department generation

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

diff --git a/plugins/gofon/conference/class_phoneConferenceGeneric.inc b/plugins/gofon/conference/class_phoneConferenceGeneric.inc
index 591bd244d9b3f85c54264e67bfc61248d03255b8..7da0510bc4e21df634819ce0f384a68d3f1e512f 100644 (file)
--- a/plugins/gofon/conference/class_phoneConferenceGeneric.inc
+++ b/plugins/gofon/conference/class_phoneConferenceGeneric.inc
@@ -111,11 +111,9 @@ class conference extends plugin
 
   function execute()
   {
-       /* Call parent execute */
-       plugin::execute();
+    /* Call parent execute */
+    plugin::execute();
 
-    $this->config->departments    = get_departments($this->dn);
-    $this->config->make_idepartments();
     $smarty= get_smarty();
 
     $smarty->assign("bases" ,$this->config->idepartments);

diff --git a/plugins/gofon/conference/class_phoneConferenceManagment.inc b/plugins/gofon/conference/class_phoneConferenceManagment.inc
index 2dd80d88de4556dab2d08b43a661dd2a6dbba5e9..4f481ff19351cafe8d75cc7b0c591e0afb911ef7 100644 (file)
--- a/plugins/gofon/conference/class_phoneConferenceManagment.inc
+++ b/plugins/gofon/conference/class_phoneConferenceManagment.inc
@@ -67,7 +67,6 @@ class phoneConferenceManagment extends plugin
        plugin::execute();
 
     /* Reload departments */
-    $this->config->departments = get_departments();
     $smarty                                                      = get_smarty();
     $display                                             = "";
     $s_action                                          = "";  // Will contain an action, like del or edit