Index: openacs-4/packages/acs-admin/www/install/install.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/install/install.tcl,v
diff -u -r1.2.4.1 -r1.2.4.2
--- openacs-4/packages/acs-admin/www/install/install.tcl	26 Mar 2004 14:38:04 -0000	1.2.4.1
+++ openacs-4/packages/acs-admin/www/install/install.tcl	17 Apr 2004 21:32:58 -0000	1.2.4.2
@@ -1,7 +1,7 @@
 ad_page_contract {
     Install from local file system
 } {
-    {package_type "apm_application"}
+    package_type:optional
     {upgrade_p 0}
     {repository_url ""}
 }
@@ -32,7 +32,7 @@
     array unset version
     array set version $repository($package_key)
 
-    if {  [string equal $package_type "all"] || [string equal $version(package.type) $package_type] } {
+    if { ![exists_and_not_null package_type] || [string equal $version(package.type) $package_type] } {
         set package_key $version(package.key)
             
         # If in upgrade mode, only add to list if it's an upgrade
@@ -70,10 +70,11 @@
 }
 
 multirow extend packages install_url
-multirow foreach packages {
+multirow -unclobber foreach packages {
     set install_url [export_vars -base install-2 { package_key repository_url }]
 }
 
+
 # Build the list-builder list
 template::list::create \
     -name packages \
@@ -87,14 +88,18 @@
     } \
     -elements {
         package_name {
-            label "Application"
+            label "Package"
         }
         summary {
             label "Summary"
         }   
         version_name {
             label "Version"
         }
+        package_type {
+            label "Type"
+            display_eval {[ad_decode $package_type "apm_application" "Application" "Service"]}
+        }
         upgrade {
             label "Upgrade"
             hide_p {[ad_decode $upgrades_p 1 0 1]}
@@ -106,7 +111,25 @@
             link_html { title "Install single application" }
             display_template {Install}
         }
+    } -filters {
+        package_type {
+            label "Type"
+            values {
+                {Application apm_application}
+                {Service apm_service}
+            }
+        }
+        upgrade_p {
+            label "Upgrade"
+            values {
+                {"Install" 0}
+                {"Upgrade" 1}
+            }
+            default_value 0
+        }
+        repository_url {
+            hide_p 1
+        }
     }
 
 
-