Design changes, only set section release if set button is pressed

[gosa.git] / plugins / admin / fai / class_faiPackageNew.inc

diff --git a/plugins/admin/fai/class_faiPackageNew.inc b/plugins/admin/fai/class_faiPackageNew.inc
index 45ca89db01546d63ebe7750bf5dc6e6aa29e1e38..4437598370f824dc89d5c1c064c521e8986c286f 100644 (file)
--- a/plugins/admin/fai/class_faiPackageNew.inc
+++ b/plugins/admin/fai/class_faiPackageNew.inc
@@ -51,13 +51,6 @@ class faiPackageNew extends plugin
 
     /* Post handling for Section, Release and Mirror Setup */
     if(isset($_POST['SetRepository'])){
-      if((isset($_POST['FAIdebianReleaseS']))&&(!empty($_POST['FAIdebianReleaseS']))){
-        $this->FAIdebianRelease = $_POST['FAIdebianReleaseS'];
-      }
-      if((isset($_POST['FAIdebianMirrorS']))&&(!empty($_POST['FAIdebianMirrorS']))){
-        $this->FAIdebianMirror = $_POST['FAIdebianMirrorS'];
-      }
-
       foreach($this->sections as $sec => $val){
         if(isset($_POST[$sec])){
           $this->sections[$sec]=true;
@@ -75,7 +68,7 @@ class faiPackageNew extends plugin
     }elseif(empty($this->FAIdebianSection)){
       $disableRelease = $disableMirror  = $disableContinue = true;
     }elseif(empty($this->FAIdebianMirror)){
-      $disableRelease = $disableSection = $disableContinue = true;
+      $disableRelease = $disableSection =  true;
     }else{
       $disableRelease = $disableSection =  true;
     }
@@ -83,12 +76,19 @@ class faiPackageNew extends plugin
     /* check servers matching release and section settings */
     $availableServer = array();
     foreach($this->mirrors as $mir){
+    
+      /* Check if release and section match */
       if($mir['release'] == $this->FAIdebianRelease){
         $pass = true;
+    
         foreach($this->FAIdebianSection as $sec){
+
+        /* If a mirror match, attach */
           if($sec != $mir['section']){
             $pass = false;
           }
+
+        /* Save all matching */ 
         if($pass){
             $availableServer[$mir['mirror']]=$mir['mirror'];
           }
@@ -159,6 +159,10 @@ class faiPackageNew extends plugin
       $smarty->assign("SectionACL"," disabled ");
     }
 
+
+    $smarty->assign("DisSection",!empty($this->FAIdebianSection));
+    $smarty->assign("DisRelease",!empty($this->FAIdebianRelease));
+
     $smarty->assign("mirrors" ,$availableServer);
     $smarty->assign("mirror"  ,$this->FAIdebianMirror);
     $smarty->assign("releases",$this->releases);
@@ -173,6 +177,15 @@ class faiPackageNew extends plugin
   /* Save data to object */
   function save_object()
   {
+    if(isset($_POST['SetRepository'])){
+      /* Post handling for Section, Release and Mirror Setup */
+      if((isset($_POST['FAIdebianReleaseS']))&&(!empty($_POST['FAIdebianReleaseS']))){
+        $this->FAIdebianRelease = $_POST['FAIdebianReleaseS'];
+      }
+      if((isset($_POST['FAIdebianMirrorS']))&&(!empty($_POST['FAIdebianMirrorS']))){
+        $this->FAIdebianMirror = $_POST['FAIdebianMirrorS'];
+      }
+    }
   }
 
   /* Check supplied data */