Fixed mapping

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

diff --git a/plugins/admin/systems/class_workstationGeneric.inc b/plugins/admin/systems/class_workstationGeneric.inc
index 002d3f378228cca3bad68096144349d03dba2a33..d5ceb2ae9d8df9fe0dbf8668080238905e9b40f1 100644 (file)
--- a/plugins/admin/systems/class_workstationGeneric.inc
+++ b/plugins/admin/systems/class_workstationGeneric.inc
@@ -50,7 +50,7 @@ class workgeneric extends plugin
       "ghGfxAdapter", "ghSoundAdapter", "gotoLastUser", "l","FAIscript");
   var $objectclasses= array("top", "gotoWorkstation", "GOhard","FAIobject");
 
-  var $mapActions   = array("reboot"          => "",
+  var $mapActions   = array("reboot"          => "localboot",
                             "instant_update"  => "softupdate",
                             "update"          => "sceduledupdate",
                             "reinstall"       => "install",

diff --git a/plugins/admin/systems/class_workstationStartup.inc b/plugins/admin/systems/class_workstationStartup.inc
index 6df7411c75390f6a503a06bb57e438d86d806400..ba39d60db3235177802da29de35d4e9eb1ccc637 100644 (file)
--- a/plugins/admin/systems/class_workstationStartup.inc
+++ b/plugins/admin/systems/class_workstationStartup.inc
@@ -997,13 +997,6 @@ class workstartup extends plugin
 
     /* Remove FAI objects if no FAI class is selected */ 
     if((count($this->FAIclass)==0) && (!isset($checkFAIstate['FAIstate']))){
-      $tmp = array();
-      foreach($this->attrs['objectClass'] as $class){
-        if($class != "FAIobject"){
-          $tmp[] = $class;
-        }
-      }
-      $this->attrs['objectClass']     = $tmp;
       $this->attrs['FAIclass']        = array();
       $this->attrs['FAIdebianMirror'] = array();
     }