Index: openacs-4/packages/acs-admin/www/install/index.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/install/index.tcl,v diff -u -r1.8.2.7 -r1.8.2.8 --- openacs-4/packages/acs-admin/www/install/index.tcl 4 Oct 2015 15:22:25 -0000 1.8.2.7 +++ openacs-4/packages/acs-admin/www/install/index.tcl 7 Oct 2015 17:07:06 -0000 1.8.2.8 @@ -10,91 +10,9 @@ set local_install_url "[ad_conn package_url]/apm/packages-install" set local_path $::acs::rootdir/packages -set repository_url "http://openacs.org/repository/" -set head_channel [lindex [apm_get_repository_channels $repository_url] 0] -set current_channel [apm_get_repository_channel] -set channel $current_channel set remote_install_url [export_vars -base "install/install" { repository_url channel current_channel head_channel }] -set remote_upgrade_url [export_vars -base "install/install" { { upgrade_p 1 } repository_url channel current_channel head_channel}] +set remote_upgrade_url [export_vars -base "install/install" { {upgrade_p 1} repository_url channel current_channel head_channel}] -# template::multirow create install repository local -# -# multirow append install \ -# {Download and install/upgrade automatically from OpenACS.org repository} \ -# {Install/upgrade from local files. Use this if your site has custom code or is in a local CVS repository. -# Help} -# -# multirow append install \ -# [subst { Install or -# upgrade from repository.}] \ -# [subst {Install or upgrade from local file system.}] -# -# template::list::create \ -# -name install \ -# -multirow install \ -# -elements { -# repository { -# label "Install from Repository" -# display_template @install.repository;noquote@ -# } -# local { -# label "Install from Local Files" -# display_template @install.local;noquote@ -# } -# } -# -# -# -# template::list::create \ -# -name packages \ -# -multirow packages \ -# -elements { -# pretty_name { -# label "Package" -# html {align left} -# } -# version_name { -# label "Version" -# html {align left} -# } -# package_type_pretty { -# label "Type" -# hide_p 1 -# } -# } -filters { -# package_type { -# label "Type" -# default_value apm_application -# where_clause { -# t.package_type = :package_type -# } -# values { -# {Application apm_application} -# {Service apm_service} -# } -# } -# } -# -# db_multirow -extend { package_type_pretty } packages packages " -# select v.version_id, -# v.package_key, -# t.pretty_name, -# t.package_type, -# v.version_name -# from apm_package_versions v, -# apm_package_types t -# where t.package_key = v.package_key -# and v.enabled_p = 't' -# and v.installed_p = 't' -# [template::list::filter_where_clauses -and -name packages] -# order by t.package_type, t.pretty_name -# " { -# set package_type_pretty [string totitle [lindex [split $package_type "_"] 1]] -# } - - - - # Local variables: # mode: tcl # tcl-indent-level: 4