Code

Fixed problem with new package lists - Timeout Closes #530
authorhickert <hickert@594d385d-05f5-0310-b6e9-bd551577e9d8>
Tue, 12 Aug 2008 12:07:16 +0000 (12:07 +0000)
committerhickert <hickert@594d385d-05f5-0310-b6e9-bd551577e9d8>
Tue, 12 Aug 2008 12:07:16 +0000 (12:07 +0000)
git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@12195 594d385d-05f5-0310-b6e9-bd551577e9d8

gosa-plugins/fai/admin/fai/class_faiPackage.inc

index 4933606d5c2df31d590900fbcae09ae6d6b111a9..88806cade7169344b163e7956cc9bfaaf0f9ba71 100644 (file)
@@ -353,7 +353,9 @@ class faiPackage extends plugin
           $actions = "<input type='image' class='center' title='"._("Mark package for removal")."' 
             src='plugins/fai/images/removal_mark.png' name='removal_package_".base64_encode($usedName)."' >";
         }
-        if(!preg_match('/^freeze/', $this->FAIstate) && $this->acl_is_writeable("FAIdebconfInfo")){
+
+        if(isset($this->list[$usedName]['TEMPLATE']) && 
+           !preg_match('/^freeze/', $this->FAIstate) && $this->acl_is_writeable("FAIdebconfInfo")){
           $actions.= "&nbsp;<input type='image' class='center' title='"._("Configure this package")."' 
             src='plugins/fai/images/package_configure.png' name='configure_package_".base64_encode($usedName)."' >";
         }
@@ -463,9 +465,11 @@ class faiPackage extends plugin
    */
   function genPkgs($force = false)
   {
+    if(empty($this->FAIdebianRelease)) return;
+
     if(!count($this->buffer) || $force){
       $q = new gosaSupportDaemon();
-      $attrs = array("distribution", "package","version", "section", "description", "timestamp");
+      $attrs = array("distribution", "package","version", "section", "description", "timestamp","template");
 
       $packages = array_keys($this->usedPackages);