From: cajus <cajus@594d385d-05f5-0310-b6e9-bd551577e9d8>
Date: Fri, 24 Mar 2006 07:33:17 +0000 (+0000)
Subject: Cleanups
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=027fa8398a9ba848a03b26540b6b16b96f156eba;p=gosa.git

Cleanups


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

diff --git a/TODO b/TODO
index f0e46b029..b69e04ea0 100644
--- 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 141dd6eae..0c3060534 100644
--- 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 f4104e097..793d86ab1 100644
--- 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)));
   }