Updated startup tab for WS and server.

Not available options will be displayed, but grayed out

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

diff --git a/plugins/admin/systems/class_workstationStartup.inc b/plugins/admin/systems/class_workstationStartup.inc
index 65ac31f0d6047d6d871bc9d45688e0a26704683b..aa29a28ada72e783f7cd93258b9a46e7e030f991 100644 (file)
--- a/plugins/admin/systems/class_workstationStartup.inc
+++ b/plugins/admin/systems/class_workstationStartup.inc
@@ -454,12 +454,20 @@ class workstartup extends plugin
         else select the first one ..
      */
     $tmp2 = $this->getFAIreleases();
+    if(!isset($tmp2[$this->FAIrelease]) || !$tmp2[$this->FAIrelease]['USE']){
+      foreach($tmp2 as $key => $data){
+        if($data['USE']){
+          $this->FAIrelease = $key;
+        }
+      }
+    }
     if(!in_array($this->FAIrelease, $tmp2)){  
-      $this->FAIrelease = key($tmp2);
+    #  $this->FAIrelease = key($tmp2);
     }
  
     /* Get all Packages for this server/release combination
      */
+
     if(!isset($this->FAIServRepConfig[$this->FAIdebianMirror]['RELEASE'][$this->FAIrelease]['PACKAGES'])){
       $pkgs = array();
       print_red(_("There are packages in your configuration, which can't be resolved with current server/release settings."));
@@ -854,10 +862,12 @@ class workstartup extends plugin
     /* Only add inherit option, if we are part in an object group 
      */
     if($this->member_of_ogroup)    {
-      $ret['inherited']="["._("inherited")."]";
+      $ret['inherited']['NAME']="["._("inherited")."]";
+      $ret['inherited']['USE'] = TRUE;
     }
 
-    $ret['auto']=_("automatic");
+    $ret['auto']['NAME']=_("automatic");
+    $ret['auto']['use'] = TRUE;
     $secs  = array();
 
     /* Walk through all available servers 
@@ -865,16 +875,14 @@ class workstartup extends plugin
         if not, dont't add them to our list
      */
     foreach($this->FAIServRepConfig as $mirror => $rest){
-
       $use = false;
-
       if(count($this->FAIclass) == 0){
         $use = true;
       }else{
         $tmp = $this->getFAIreleases();
-        foreach($tmp as $release){
+        foreach($tmp as $release => $data){
           if(isset($rest['RELEASE'][$release])){
-            $use =true;
+            $use = $data['USE']; 
           }
         } 
       }
@@ -882,9 +890,8 @@ class workstartup extends plugin
       /* If current server, doesn't support this class
           remove it from list
        */
-      if($use){
-        $ret[$mirror] = $mirror;
-      }
+      $ret[$mirror]['NAME'] = $mirror;
+      $ret[$mirror]['USE'] = $use;
     }
     return($ret);
   }
@@ -899,28 +906,35 @@ class workstartup extends plugin
       $this->FAIdebianMirror = "auto";
     }
 
-    $errorClasses = array();  
-    if(isset($this->FAIServRepConfig[$this->FAIdebianMirror]['RELEASE'])) {
-      foreach($this->FAIServRepConfig[$this->FAIdebianMirror]['RELEASE'] as $release => $sections){
-        $use = true;
-
-        if(!count($this->FAIclass) == 0){
-          foreach($this->FAIclass as $class){
-            if(!in_array($class, $sections['PACKAGES'])){
-              $use = false;
-              $errorClasses[$class] = $class;
-            }else{
-              if(isset($errorClasses[$class])){
-                unset($errorClasses[$class]); 
+    $errorClasses = array();
+    foreach($this->FAIServRepConfig as $mirror => $rest){
+      if(isset($this->FAIServRepConfig[$mirror]['RELEASE'])){ 
+        foreach($this->FAIServRepConfig[$mirror]['RELEASE'] as $release => $sections){
+          $use = true;
+
+          if(!count($this->FAIclass) == 0){
+            foreach($this->FAIclass as $class){
+              if(!in_array($class, $sections['PACKAGES'])){
+                $use = false;
+                $errorClasses[$class] = $class;
+              }else{
+                if(isset($errorClasses[$class])){
+                  unset($errorClasses[$class]); 
+                }
               }
             }
           }
+
+          if($mirror != $this->FAIdebianMirror){
+            $use = false;
+          }else{
+            $use = true;
+          }
+          $ret[$release]['NAME']=$release;
+          $ret[$release]['USE']=$use;
         }
-        if($use){
-          $ret[$release]=$release;
-        }
-      }
-    } 
+      } 
+    }
     if((count($ret) == 0 ) && ($this->FAIdebianMirror != "auto")){
 
       $eClasses = " ";

diff --git a/plugins/admin/systems/workstationStartup.tpl b/plugins/admin/systems/workstationStartup.tpl
index 4172b708cb42b72c0062edf9b169fd99370ff5de..7666e3bb20904b61f52e9ed48a31d99d0f8b7248 100644 (file)
--- a/plugins/admin/systems/workstationStartup.tpl
+++ b/plugins/admin/systems/workstationStartup.tpl
@@ -80,14 +80,26 @@
                        <tr>
                                <td>
                                        <select name="FAIdebianMirror" {$FAIdebianMirrorACL} onchange='document.mainform.submit()'>
-                                               {html_options options=$FAIdebianMirrors output=$FAIdebianMirrors selected=$FAIdebianMirror}
+                                               {foreach from=$FAIdebianMirrors item=val key=key}
+                                                       {if $val.USE}
+                                                               <option value="{$key}" {if $FAIdebianMirror == $key} selected {/if}>{$val.NAME}</option>
+                                                       {else}
+                                                               <option value="auto" disabled>{$val.NAME}</option>
+                                                       {/if}
+                                               {/foreach}
                                                <option disabled>&nbsp;</option>
                                        </select>
                                <!--<input type="submit" value="{t}set{/t}" name="refresh">-->
                                </td>
                                <td>
                                        <select name="FAIrelease"  onchange='document.mainform.submit()' {$FAIclassACL}>
-                                       {html_options options=$FAIreleases output=$FAIreleases selected=$FAIrelease}
+                                               {foreach from=$FAIreleases item=val key=key}
+                                                       {if $val.USE}
+                                                               <option value="{$val.NAME}" {if $FAIrelease == $key} selected {/if}>{$val.NAME}</option>
+                                                       {else}
+                                                               <option value="auto" disabled>{$val.NAME}</option>
+                                                       {/if}
+                                               {/foreach}
                                        </select>
                                </td>
                        </tr>