Index: openacs-4/packages/acs-admin/www/apm/index.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/apm/index.tcl,v diff -u -N -r1.30.2.3 -r1.30.2.4 --- openacs-4/packages/acs-admin/www/apm/index.tcl 13 Mar 2019 09:36:56 -0000 1.30.2.3 +++ openacs-4/packages/acs-admin/www/apm/index.tcl 13 Mar 2019 09:37:19 -0000 1.30.2.4 @@ -86,13 +86,13 @@ } } -filters {owned_by {} supertype {} status {}} -set performance_p [parameter::get -package_id [ad_acs_kernel_id] -parameter PerformanceModeP -default 1] +set performance_p [parameter::get -package_id [ad_acs_kernel_id] -parameter PerformanceModeP -default 1] set reload_links_p [string is true -strict [ns_set iget [rp_getform] reload_links_p]] db_multirow -extend {package_url maintained status action_html} packages apm_table {} { set package_url [export_vars -base version-view {version_id}] set maintained [expr {$distribution_uri eq "" ? "Locally" : "Externally"}] - + if { $installed_p == "t" } { if { $enabled_p == "t" } { set status "Enabled" @@ -104,17 +104,17 @@ } else { set status "Uninstalled" } - + set file_link_list [list] lappend file_link_list "view files" if { $installed_p == "t" && $enabled_p == "t" } { if {!$performance_p} { lappend file_link_list "watch all files" - } + } if { !$reload_links_p || [apm_version_load_status $version_id] eq "needs_reload"} { lappend file_link_list "reload changed" - } - } + } + } set action_html [join $file_link_list " | "] } Index: openacs-4/packages/acs-admin/www/apm/version-callback-add-edit.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/apm/version-callback-add-edit.tcl,v diff -u -N -r1.12.2.1 -r1.12.2.2 --- openacs-4/packages/acs-admin/www/apm/version-callback-add-edit.tcl 13 Mar 2019 09:40:42 -0000 1.12.2.1 +++ openacs-4/packages/acs-admin/www/apm/version-callback-add-edit.tcl 13 Mar 2019 09:41:26 -0000 1.12.2.2 @@ -4,9 +4,9 @@ @author Peter Marklund @creation-date 28 January 2003 - @cvs-id $Id$ + @cvs-id $Id$ } { - version_id:naturalnum,notnull + version_id:naturalnum,notnull {type ""} } @@ -43,15 +43,15 @@ set type_label "Tcl procedure name" ad_form -name callback -cancel_url $return_url -form { - {version_id:integer(hidden) + {version_id:integer(hidden) {value $version_id} } - {return_url:text(hidden) + {return_url:text(hidden) {value $return_url} } - {edit_mode_p:text(hidden) + {edit_mode_p:text(hidden) {value $edit_mode_p} } @@ -79,11 +79,11 @@ "and have the following required switches: [apm_arg_names_for_callback_type -type $type]"}]} } } -on_submit { - + apm_set_callback_proc -type $type -version_id $version_id $proc apm_package_install_spec $version_id - + ad_returnredirect $return_url ad_script_abort }