Index: openacs-4/packages/acs-kernel/acs-kernel.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-kernel/acs-kernel.info,v
diff -u -r1.150.2.64 -r1.150.2.65
--- openacs-4/packages/acs-kernel/acs-kernel.info 30 Jul 2024 17:48:19 -0000 1.150.2.64
+++ openacs-4/packages/acs-kernel/acs-kernel.info 30 Jul 2024 17:53:44 -0000 1.150.2.65
@@ -35,7 +35,7 @@
-
+
@@ -73,7 +73,7 @@
-
+
Index: openacs-4/packages/acs-tcl/lib/check-installed.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/lib/check-installed.adp,v
diff -u -r1.1.2.6 -r1.1.2.7
--- openacs-4/packages/acs-tcl/lib/check-installed.adp 30 Jul 2024 10:25:44 -0000 1.1.2.6
+++ openacs-4/packages/acs-tcl/lib/check-installed.adp 30 Jul 2024 17:53:44 -0000 1.1.2.7
@@ -3,9 +3,14 @@
@version@
(newest version on cdnjs: @newest_version@).
-
-- You might modify or delete the package parameter "@parameter_name@".
+
+- You might modify the parameter value or
+ delete the package parameter "@parameter_name@".
+
+- You might add the global package parameter
+ "@parameter_name@" to pin the version number to the current value for this instance.
+
- You might check available versions available upstream.
- You might check on Synk the
Index: openacs-4/packages/acs-tcl/lib/check-installed.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/lib/check-installed.tcl,v
diff -u -r1.3.2.11 -r1.3.2.12
--- openacs-4/packages/acs-tcl/lib/check-installed.tcl 30 Jul 2024 10:25:44 -0000 1.3.2.11
+++ openacs-4/packages/acs-tcl/lib/check-installed.tcl 30 Jul 2024 17:53:44 -0000 1.3.2.12
@@ -31,6 +31,8 @@
dict set parameterInfo default_value ?
}
+set return_url [ad_conn url]
+
dict with parameterInfo {
set parameter_id [::acs::dc list get {
select parameter_id from apm_parameters
@@ -39,21 +41,43 @@
}]
if {$parameter_id ne ""} {
set configured_via "package parameter $parameter_name"
- set actions modify_or_delete_package_parameter
- set modifyURL [string cat /shared/parameters?package_key=$package_key \
- &scope=global \
- &return_url=[ad_conn url]\
- &scroll_to=$parameter_name]
+ set modifyPackageParameterURL [export_vars -base "/shared/parameters" {
+ package_key
+ {scope global}
+ return_url
+ {scroll_to $parameter_name}
+ }]
+ set version_id [apm_version_id_from_package_key $package_key]
+ set return_label "Back to Site-wide Admin Page"
+ set deletePackageParameterURL [export_vars -base "/acs-admin/apm/version-parameters" {
+ version_id
+ {section_name all}
+ {scope global}
+ return_url
+ return_label
+ {scroll_to $parameter_name}
+ }]
+ # missing for deletePackageParameterURL: filtering, scroll_to
} else {
set parameter_value [ns_config ns_section ns/server/[ns_info server]/acs/$package_key $parameter_name]
if {$parameter_value eq ""} {
set configured_via "configuration file"
} else {
- set configured_via "default value"
+ set configured_via "default value of the package"
+ set version_id [apm_version_id_from_package_key $package_key]
+ set description "Version number of [dict get $resource_info resourceName]"
+ set addPackageParameterURL [export_vars -base "/acs-admin/apm/parameter-add" {
+ version_id
+ {section_name all}
+ {scope global}
+ parameter_name
+ default_value
+ description
+ return_url
+ return_label
+ }]
}
- set actions create_package_parameter
}
- #set default_version $default_value
}
Index: openacs-4/packages/acs-tcl/tcl/json-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/json-procs.tcl,v
diff -u -r1.11.2.8 -r1.11.2.9
--- openacs-4/packages/acs-tcl/tcl/json-procs.tcl 28 Jul 2024 11:57:34 -0000 1.11.2.8
+++ openacs-4/packages/acs-tcl/tcl/json-procs.tcl 30 Jul 2024 17:53:44 -0000 1.11.2.9
@@ -712,7 +712,7 @@
Parse JSON text into a Tcl dict.
This function is NOT based on the functions from the
- "util::json::" namepsace, and is built on top of tDOM. It is a
+ "util::json::" namespace, and is built on top of tDOM. It is a
replacement for the "json::json2dict" in the tcllib package
"json", but is on sample documents several times faster.
Index: openacs-4/packages/acs-tcl/tcl/utilities-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/utilities-procs.tcl,v
diff -u -r1.189.2.190 -r1.189.2.191
--- openacs-4/packages/acs-tcl/tcl/utilities-procs.tcl 30 Jul 2024 17:49:03 -0000 1.189.2.190
+++ openacs-4/packages/acs-tcl/tcl/utilities-procs.tcl 30 Jul 2024 17:53:44 -0000 1.189.2.191
@@ -4338,7 +4338,7 @@
when the site has no Internet connection). Therefore, the call
will return a default value. This function is to be called for
non-essential calls, like e.g. obtaining the newest version of
- library, etc. The result is cached by defailt for 5 minutes.
+ library, etc. The result is cached by default for 5 minutes.
@param url URL for the GET request
@param key cache key