} + } return $widget } Index: openacs-4/packages/acs-admin/tcl/site-wide-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/tcl/site-wide-procs.tcl,v diff -u -r1.1.2.4 -r1.1.2.5 --- openacs-4/packages/acs-admin/tcl/site-wide-procs.tcl 27 Feb 2020 21:54:26 -0000 1.1.2.4 +++ openacs-4/packages/acs-admin/tcl/site-wide-procs.tcl 13 May 2020 19:29:28 -0000 1.1.2.5 @@ -48,7 +48,7 @@ Require a package under the site-wide subsite. If such a package does not exist, it is created with the provided - parameters. When a configuratioon command is passed-in + parameters. When a configuration command is passed-in it will be called with "-package_id $package_id" of the new instance appended. @@ -83,7 +83,7 @@ # During bootstrap, the package_id might be empty, because # the after_initiate callback might call the # site-wide-init, which in turn might initiate another - # instance. Thefore, we might be called between site-node + # instance. Therefore, we might be called between site-node # creation and mounting .. which will result in an empty # package_id. # Index: openacs-4/packages/acs-admin/www/apm/packages-install.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/apm/packages-install.tcl,v diff -u -r1.28.2.4 -r1.28.2.5 --- openacs-4/packages/acs-admin/www/apm/packages-install.tcl 16 Apr 2019 07:00:36 -0000 1.28.2.4 +++ openacs-4/packages/acs-admin/www/apm/packages-install.tcl 13 May 2020 19:29:28 -0000 1.28.2.5 @@ -93,6 +93,8 @@ }] } else { + ns_log notice "spec_files <$spec_files>" + append body [subst {-
}] + if {[llength $to_install] > 0} { + set label [dict get {install Install upgrade Upgrade all Install/Update} $operation] + } else { + set label [subst { + + }] + template::add_event_listener \ + -id bulkaction-control \ + -preventdefault=false \ + -script [subst {acs_ListCheckAll('$form', this.checked);}] + } + set widget [subst { + $label Package Package Key Comment } + if {$counter == 0} { + set widget "" + } else { + append widget {+
+ }] + foreach pkg_info $pkg_info_list { incr counter @@ -126,53 +140,60 @@ set package [apm_read_package_info_file $spec_file] set package_name [dict get $package package-name] set version_name [dict get $package name] + set id $form-$package_key ns_log Debug "Selection widget: $package_key, Dependency: [pkg_info_dependency_p $pkg_info]" - append widget [subst { $label Package Package Key Comment }] if { [pkg_info_dependency_p $pkg_info] == "t" } { + # # Dependency passed. - - if { $package_key in $to_install } { - append widget " - + # + set checked [expr { $package_key in $to_install ? "checked " : "" }] + append widget [subst { + + }] + + }] } elseif { [pkg_info_dependency_p $pkg_info] == "f" } { - #Dependency failed. + # + # Dependency failed. + # append widget [subst { -$package_name $version_name $package_key Dependencies satisfied. -+ + - } } else { + # # No dependency information. # See if the install is already installed with a higher version number. + # if {[apm_package_registered_p $package_key]} { set higher_version_p [apm_higher_version_installed_p $package_key $version_name] } else { set higher_version_p 2 } if {$higher_version_p == 2 } { - if {$operation eq "upgrade"} continue + if {$operation eq "upgrade"} { + incr counter -1 + continue + } set comment "New install." } elseif {$higher_version_p == 1 } { - if {$operation eq "install"} continue + if {$operation eq "install"} { + incr counter -1 + continue + } set comment "Upgrade." } elseif {$higher_version_p == 0} { set comment "Package version already installed." @@ -182,14 +203,20 @@ set install_checked [expr {$package_key in $to_install ? "checked" : ""}] append widget [subst { -$package_name $version_name $package_key }] foreach comment [pkg_info_comment $pkg_info] { append widget "$comment + append widget \ + \
" } - append widget { -- $package_name $version_name -$package_key -$comment - }] ++ + }] } } - append widget {+ $package_name $version_name +$package_key +$comment +
Please select the set of packages you'd like to [string tolower $operation].
@@ -102,29 +104,6 @@ }] set formName "pkgsForm" - template::add_event_listener \ - -id check_all \ - -script [subst { - var install_form = document.getElementsByName('$formName')\[0\]; - for (var i = 0; i < install_form.length; ++i) { - install_form.elements\[i\].checked = true; - //install_form.elements\[i\].href = ''; - } - }] - - template::add_event_listener \ - -id uncheck_all \ - -script [subst { - var install_form = document.getElementsByName('$formName')\[0\]; - for (var i = 0; i < install_form.length; ++i) { - install_form.elements\[i\].checked = false; - } - }] - - append body { - uncheck all boxes | - check all boxes - } #packages-install?checked_by_default_p=1 append body " - }] - + append body \ + $widget \ + [subst { + + + }] + } if {$errors ne ""} { - append body "The following errors were generated -