Index: openacs-4/packages/dotlrn/tcl/apm-callback-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/tcl/apm-callback-procs.tcl,v diff -u -N -r1.19.2.1 -r1.19.2.2 --- openacs-4/packages/dotlrn/tcl/apm-callback-procs.tcl 10 Aug 2019 18:19:46 -0000 1.19.2.1 +++ openacs-4/packages/dotlrn/tcl/apm-callback-procs.tcl 6 Mar 2020 14:37:47 -0000 1.19.2.2 @@ -22,7 +22,7 @@ # Create a new group, dotlrn-admin db_transaction { - set group_id [group::new -group_name "dotlrn-admin" ] + set group_id [group::new -group_name "dotlrn-admin" ] } # Grant new-portal admin permission @@ -56,7 +56,7 @@ set group_id [db_string group_id_from_name " select group_id from groups where group_name='dotlrn-admin'" -default ""] if {$group_id ne "" } { - + #Admin privs permission::grant \ -party_id $group_id \ @@ -73,15 +73,15 @@ set default_template_name [parameter::get \ -package_id $package_id \ -parameter DefaultSiteTemplate \ - -default "#new-portal.sloan_theme_name#"] + -default "#new-portal.sloan_theme_name#"] ns_log notice "Try to install default Site Template named '$default_template_name'" set site_template_id [db_string select_st_id {}] - + # for communities parameter::set_value -package_id $package_id \ -parameter "CommDefaultSiteTemplate_p" \ -value $site_template_id - + # for users parameter::set_value -package_id $package_id \ -parameter "UserDefaultSiteTemplate_p" \ @@ -108,7 +108,7 @@ db_transaction { set object_id [group::delete $group_id] } - } + } } @@ -122,20 +122,20 @@ apm_upgrade_logic \ -from_version_name $from_version_name \ -to_version_name $to_version_name \ - -spec { - 2.0.3 2.1.0 { + -spec { + 2.0.3 2.1.0 { db_transaction { ns_log notice "dotlrn upgrade: starting..." #create dotlrn-admin group - set dotlrn_admins_group [group::new -group_name "dotlrn-admin" ] + set dotlrn_admins_group [group::new -group_name "dotlrn-admin" ] ns_log notice "dotlrn upgrade: dotlrn-admin group created..." - + #grant dotlrn admin permission permission::grant \ -party_id $dotlrn_admins_group \ -object_id [dotlrn::get_package_id] \ - -privilege "admin" + -privilege "admin" ns_log notice "dotlrn upgrade: dotlrn permission granted..." @@ -156,96 +156,96 @@ ns_log notice "dotlrn upgrade: new-portal permission granted..." } - + db_transaction { - + #grant admin permission on old communities db_foreach community_group "select community_id from dotlrn_communities" { permission::grant \ -party_id $dotlrn_admins_group \ -object_id $community_id \ - -privilege "admin" - + -privilege "admin" + ns_log notice "dotlrn upgrade: community $community_id permission granted to dotlrn-admin ..." - + } } } 2.2.0d1 2.2.0d2 { #Setting the default Site Template set site_template_id [db_string select_st_id "select site_template_id from dotlrn_site_templates where pretty_name = '#new-portal.sloan_theme_name#'"] - + set package_id [dotlrn::get_package_id] #for communities parameter::set_value -package_id $package_id \ -parameter "CommDefaultSiteTemplate_p" \ -value $site_template_id - + #for users parameter::set_value -package_id $package_id \ -parameter "UserDefaultSiteTemplate_p" \ -value $site_template_id - + parameter::set_from_package_key -package_key "acs-subsite" \ -parameter "DefaultMaster" \ -value "/packages/dotlrn/www/dotlrn-master-custom" - + # This fixes parameter resetting from dotlrn - set community_level_p_param_id [db_string select_clevel_id { + set community_level_p_param_id [db_string select_clevel_id { select parameter_id - from apm_parameters + from apm_parameters where package_key='dotlrn' and parameter_name='community_level_p'}] - - set comm_type_level_p_param_id [db_string select_ctlevel_id { + + set comm_type_level_p_param_id [db_string select_ctlevel_id { select parameter_id - from apm_parameters + from apm_parameters where package_key='dotlrn' and parameter_name='community_type_level_p'}] - - set dotlrn_level_p_param_id [db_string select_dlevel_id { + + set dotlrn_level_p_param_id [db_string select_dlevel_id { select parameter_id - from apm_parameters + from apm_parameters where package_key='dotlrn' and parameter_name='dotlrn_level_p'}] - + db_foreach select_attr_values { select community_id from dotlrn_communities_all } { - set package_id [dotlrn_community::get_package_id $community_id] + set package_id [dotlrn_community::get_package_id $community_id] ns_log Notice "upgrade: $package_id parameter_id: $community_level_p_param_id" - db_dml community_level_p_update { - update apm_parameter_values set + db_dml community_level_p_update { + update apm_parameter_values set attr_value=(select attr_value from - apm_parameter_values_copy where package_id=:package_id + apm_parameter_values_copy where package_id=:package_id and parameter_id=:community_level_p_param_id) where package_id=:package_id and parameter_id=:community_level_p_param_id } - - db_dml community_type_level_p_update { - update apm_parameter_values set + + db_dml community_type_level_p_update { + update apm_parameter_values set attr_value=(select attr_value from - apm_parameter_values_copy where package_id=:package_id + apm_parameter_values_copy where package_id=:package_id and parameter_id=:comm_type_level_p_param_id) where package_id=:package_id and parameter_id=:comm_type_level_p_param_id } - - db_dml dotlrn_level_p_update { - update apm_parameter_values set + + db_dml dotlrn_level_p_update { + update apm_parameter_values set attr_value=(select attr_value from - apm_parameter_values_copy where package_id=:package_id + apm_parameter_values_copy where package_id=:package_id and parameter_id=:dotlrn_level_p_param_id) where package_id=:package_id and parameter_id=:dotlrn_level_p_param_id } } - + } 2.2.0a2 2.2.0a3 { # This fixes a security hole opened up when cloning @@ -257,16 +257,16 @@ and o.security_inherit_p = 't' } { permission::set_not_inherit -object_id $community_id - } - + } + } 2.2.0a3 2.2.0a4 { parameter::set_from_package_key \ -package_key acs-kernel \ -parameter HomeURL \ -value /dotlrn/control-panel } - 2.3.0d1 2.3.0d2 { + 2.3.0d1 2.3.0d2 { # Set access keys for all pages that have known titles set params [list] db_foreach get_default_values {} { @@ -302,7 +302,7 @@ if {$attribute_id ne ""} { attribute::delete $attribute_id } - } + } } }