Cleanups

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

diff --git a/TODO b/TODO
index f0e46b0298af9c83058ffcca3430c358caf9ea95..b69e04ea0fb24ea59bb4b35dab020e917957a9bc 100644 (file)
--- a/TODO
+++ b/TODO
@@ -1,6 +1,8 @@
 Target for 2.4.1:
 =================
 
+* Speed up workstation loading
+
 * Create a status-bar/-display for FAI installations 
        (Use notes from 0.5.12.2005)
 

diff --git a/plugins/admin/systems/class_terminalInfo.inc b/plugins/admin/systems/class_terminalInfo.inc
index 141dd6eae3d8fe6a6443f4213eaf84b66a4749fb..0c3060534fd4851c8ddee32e7a3b7d47bfb04996 100644 (file)
--- a/plugins/admin/systems/class_terminalInfo.inc
+++ b/plugins/admin/systems/class_terminalInfo.inc
@@ -60,6 +60,7 @@ class terminfo extends plugin
   {
     /* Call parent execute */
     plugin::execute();
+    return;
 
     /* Do we represent a valid terminal? */
     if (!$this->is_account && $this->parent == NULL){

diff --git a/plugins/admin/systems/class_workstationGeneric.inc b/plugins/admin/systems/class_workstationGeneric.inc
index f4104e0971ca68abbede37602a91ef278874e9e7..793d86ab10293fb4146e11360d65fcac68ba0fdb 100644 (file)
--- a/plugins/admin/systems/class_workstationGeneric.inc
+++ b/plugins/admin/systems/class_workstationGeneric.inc
@@ -86,8 +86,8 @@ class workgeneric extends plugin
 
   function execute()
   {
-       /* Call parent execute */
-       plugin::execute();
+    /* Call parent execute */
+    plugin::execute();
 
     /* Do we need to flip is_account state? */
     if (isset($_POST['modify_state'])){
@@ -177,7 +177,7 @@ class workgeneric extends plugin
     $smarty->assign("actionACL", chkacl($this->acl, 'action'));
 
     /* Show main page */
-    $smarty->assign("netconfig", $this->netConfigDNS->execute());
+    #$smarty->assign("netconfig", $this->netConfigDNS->execute());
     return($smarty->fetch (get_template_path('workstation.tpl', TRUE)));
   }