Index: openacs-4/packages/acs-tcl/tcl/defs-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/defs-procs.tcl,v
diff -u -r1.83 -r1.84
--- openacs-4/packages/acs-tcl/tcl/defs-procs.tcl 11 Sep 2024 06:15:48 -0000 1.83
+++ openacs-4/packages/acs-tcl/tcl/defs-procs.tcl 28 Dec 2024 15:39:56 -0000 1.84
@@ -840,10 +840,16 @@
} {
Ends the progress bar by causing the browser to redirect to a new URL.
+ @param url must be a properly encoded URL, such as returned by "export_vars"
+
@see ad_progress_bar_begin
} {
util_user_message -message $message_after_redirect
- ns_write ""
+ #
+ # Using "ns_quotehtml" on the URL leads to overquoting, e.g., when running the
+ # the end of install-from-repository.
+ #
+ ns_write ""
ns_conn close
}
Index: openacs-4/packages/acs-tcl/tcl/install-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/install-procs.tcl,v
diff -u -r1.39 -r1.40
--- openacs-4/packages/acs-tcl/tcl/install-procs.tcl 11 Sep 2024 06:15:48 -0000 1.39
+++ openacs-4/packages/acs-tcl/tcl/install-procs.tcl 28 Dec 2024 15:39:56 -0000 1.40
@@ -116,10 +116,10 @@
regsub -all -- {//} $mount_point "/" mount_point
set mount_point [string trim $mount_point " /"]
- if {[string is space $mount_point] || $mount_point eq "/"} {
+ if {$mount_point eq ""} {
array set site_node [site_node::get -url "/"]
- if {$site_node(object_id) ne ""} {
+ if {$site_node(url) eq "/"} {
ns_log Error "A package is already mounted at '$mount_point', ignoring mount command"
lappend out "A package is already mounted at '$mount_point', ignoring mount command"
set node_id ""
@@ -150,7 +150,7 @@
}
# There now definitely a node with that path
- if {$site_node(object_id) eq ""} {
+ if {[string trimright $site_node(url) /] ne "/$mount_point"} {
# no package mounted - good!
set node_id $site_node(node_id)
} else {
@@ -167,7 +167,7 @@
if {$node_id ne ""} {
lappend out "Mounting new instance of package $package_key at /$mount_point"
set package_id [site_node::instantiate_and_mount \
- -node_id $node_id \
+ -parent_node_id $node_id \
-context_id $context_id \
-node_name $mount_point \
-package_name $instance_name \
@@ -200,10 +200,10 @@
regsub -all -- {//} $mount_point "/" mount_point
set mount_point [string trim $mount_point " /"]
- if {[string is space $mount_point] || $mount_point eq "/"} {
+ if {$mount_point eq ""} {
array set site_node [site_node::get -url "/"]
- if {$site_node(object_id) ne ""} {
+ if {$site_node(url) eq "/"} {
ns_log Error "A package is already mounted at '$mount_point', ignoring mount command"
lappend out "A package is already mounted at '$mount_point', ignoring mount command"
set node_id ""
@@ -228,7 +228,7 @@
}
# There now definitely a node with that path
- if {$site_node(object_id) eq ""} {
+ if {[string trimright $site_node(url) /] ne "/$mount_point"} {
# no package mounted - good!
set node_id $site_node(node_id)
} else {
@@ -247,6 +247,12 @@
set package_id [apm_package_id_from_key $package_key]
}
+ #
+ # Probably, "node_id" is actually the parent_node_id, similar
+ # to the fix in install::xml::action::mount from Dec 27, 2024.
+ # However, we have not test or application scenario for that,
+ # so we leave the mount call untouched.
+ #
set package_id [site_node::mount \
-node_id $node_id \
-object_id $package_id]
Index: openacs-4/packages/dotlrn/install.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/install.xml,v
diff -u -r1.26 -r1.27
--- openacs-4/packages/dotlrn/install.xml 3 Sep 2024 15:37:37 -0000 1.26
+++ openacs-4/packages/dotlrn/install.xml 28 Dec 2024 15:39:56 -0000 1.27
@@ -60,7 +60,7 @@
-
+
Index: openacs-4/packages/dotlrn-bootstrap3-theme/install.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-bootstrap3-theme/install.xml,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/dotlrn-bootstrap3-theme/install.xml 7 Aug 2017 23:48:09 -0000 1.2
+++ openacs-4/packages/dotlrn-bootstrap3-theme/install.xml 28 Dec 2024 15:39:56 -0000 1.3
@@ -22,6 +22,8 @@
+
+