Index: openacs-4/packages/acs-admin/www/apm/packages-install-2.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/apm/packages-install-2.tcl,v diff -u -N -r1.12.4.8 -r1.12.4.9 --- openacs-4/packages/acs-admin/www/apm/packages-install-2.tcl 11 Oct 2013 11:43:46 -0000 1.12.4.8 +++ openacs-4/packages/acs-admin/www/apm/packages-install-2.tcl 17 Aug 2014 08:11:10 -0000 1.12.4.9 @@ -6,20 +6,17 @@ @creation-date Mon Oct 9 00:13:43 2000 @cvs-id $Id$ } { - {install:multiple ""} - {enable:multiple ""} + {package_key:multiple ""} {force_p "f"} } # Install and enable are sets of keys; need to turn them back into spec files. set spec_files [ad_get_client_property apm spec_files] -# LARS HACK: I got rid of the separate install/enable checkboxes -set install $enable +set install $package_key # Clear out previous client properties. ad_set_client_property -clob t apm pkg_install_list "" -ad_set_client_property -clob t apm pkg_enable_list "" foreach spec_file $spec_files { # Get package info, and find out if this is a package we should install @@ -71,18 +68,13 @@
[export_vars -form {spec_files}]

- -

- }] set install [concat $install $extra_package_keys] - set enable [concat $enable $extra_package_keys] - append body [apm_package_selection_widget [lindex $dependency_results 1] $install $enable] + append body [apm_package_selection_widget [lindex $dependency_results 1] $install] append body [subst { -
}] @@ -93,7 +85,6 @@ # We use client properties to pass along this information as it is fairly large. ad_set_client_property -clob t apm pkg_install_list [lindex $dependency_results 1] - ad_set_client_property -clob t apm pkg_enable_list $enable ad_returnredirect packages-install-3 ad_script_abort @@ -120,12 +111,10 @@ [export_vars -form {spec_files}]

-

- }] append body \ - [apm_package_selection_widget [lindex $dependency_results 1] $install $enable] \ + [apm_package_selection_widget [lindex $dependency_results 1] $install] \ [subst {
Force the install