Index: openacs-4/packages/acs-admin/tcl/apm-admin-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/tcl/apm-admin-procs.tcl,v diff -u -r1.26 -r1.27 --- openacs-4/packages/acs-admin/tcl/apm-admin-procs.tcl 9 May 2018 15:33:28 -0000 1.26 +++ openacs-4/packages/acs-admin/tcl/apm-admin-procs.tcl 16 May 2018 17:08:51 -0000 1.27 @@ -18,15 +18,13 @@ }] if { [llength $sections] > 1 } { - set i 0 lappend section_list [list $package_key $package_key [list "where" "section_name is null"]] foreach section $sections { - incr i if { $section ne "" } { - lappend section_list [list "section_$i" $section [list "where" "section_name = '[db_quote $section]'"]] + lappend section_list [list $section $section [list "where" "section_name = '[db_quote $section]'"]] } } - lappend section_list [list all "All" [list] ] + lappend section_list [list all "All" [list]] return [list [list section_name "Section:" $package_key $section_list]] } else { return "" Index: openacs-4/packages/acs-admin/www/apm/parameter-add-2.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/apm/parameter-add-2.tcl,v diff -u -r1.13 -r1.14 --- openacs-4/packages/acs-admin/www/apm/parameter-add-2.tcl 2 Feb 2018 00:04:50 -0000 1.13 +++ openacs-4/packages/acs-admin/www/apm/parameter-add-2.tcl 16 May 2018 17:08:51 -0000 1.14 @@ -50,15 +50,6 @@ } } -# LARS hack -set sections [lindex [apm_parameter_section_slider $package_key] 0 3] -foreach section $sections { - if {$section_name eq [lindex $section 1]} { - set section_name [lindex $section 0] - break - } -} - ad_returnredirect [export_vars -base "version-parameters" { version_id section_name }] ad_script_abort Index: openacs-4/packages/acs-admin/www/apm/parameter-add.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/apm/parameter-add.tcl,v diff -u -r1.11 -r1.12 --- openacs-4/packages/acs-admin/www/apm/parameter-add.tcl 7 Aug 2017 23:47:45 -0000 1.11 +++ openacs-4/packages/acs-admin/www/apm/parameter-add.tcl 16 May 2018 17:08:51 -0000 1.12 @@ -17,6 +17,15 @@ where version_id = :version_id } +# This to filter out sections such as "all" and $package_key, which +# have special meaning and are not supposed to be created. +if {![db_string get_section { + select exists (select 1 from apm_parameters + where section_name = :section_name + and package_key = :package_key) from dual}]} { + set section_name "" +} + set title "Add Parameter" set context [list \ [list "." "Package Manager"] \ Index: openacs-4/packages/acs-admin/www/apm/parameter-delete.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/apm/parameter-delete.tcl,v diff -u -r1.8 -r1.9 --- openacs-4/packages/acs-admin/www/apm/parameter-delete.tcl 7 Aug 2017 23:47:45 -0000 1.8 +++ openacs-4/packages/acs-admin/www/apm/parameter-delete.tcl 16 May 2018 17:08:51 -0000 1.9 @@ -16,15 +16,6 @@ where version_id = :version_id } -# LARS hack -set sections [lindex [apm_parameter_section_slider $package_key] 0 3] -foreach section $sections { - if {$section_name eq [lindex $section 1]} { - set section_name [lindex $section 0] - break - } -} - set return_url [export_vars -base "version-parameters" { version_id section_name }] ad_form -name del -form { Index: openacs-4/packages/acs-admin/www/apm/parameter-edit-2.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/apm/parameter-edit-2.tcl,v diff -u -r1.11 -r1.12 --- openacs-4/packages/acs-admin/www/apm/parameter-edit-2.tcl 2 Feb 2018 00:04:50 -0000 1.11 +++ openacs-4/packages/acs-admin/www/apm/parameter-edit-2.tcl 16 May 2018 17:08:51 -0000 1.12 @@ -39,14 +39,6 @@ ad_script_abort } -# LARS hack -set sections [lindex [apm_parameter_section_slider $package_key] 0 3] -foreach section $sections { - if {$section_name eq [lindex $section 1]} { - set section_name [lindex $section 0] - break - } -} ad_returnredirect [export_vars -base "version-parameters" { version_id section_name }] ad_script_abort Index: openacs-4/packages/acs-admin/www/apm/version-parameters.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/apm/version-parameters.tcl,v diff -u -r1.13 -r1.14 --- openacs-4/packages/acs-admin/www/apm/version-parameters.tcl 7 Apr 2018 19:41:47 -0000 1.13 +++ openacs-4/packages/acs-admin/www/apm/version-parameters.tcl 16 May 2018 17:08:51 -0000 1.14 @@ -84,20 +84,7 @@ set filter_html [ad_dimensional $dimensional_list] } -# LARS hack -set sections [lindex $dimensional_list 0 3] -foreach section $sections { - if {$section_name eq [lindex $section 0]} { - set section_name [lindex $section 1] - break - } -} - - - - - # Local variables: # mode: tcl # tcl-indent-level: 4