Index: openacs-4/packages/categories/tcl/category-form-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/categories/tcl/category-form-procs.tcl,v diff -u -r1.8.2.1 -r1.8.2.2 --- openacs-4/packages/categories/tcl/category-form-procs.tcl 29 Nov 2019 14:01:35 -0000 1.8.2.1 +++ openacs-4/packages/categories/tcl/category-form-procs.tcl 29 Nov 2019 14:32:04 -0000 1.8.2.2 @@ -43,7 +43,7 @@ {label $name} \ {category_tree_id $tree_id} \ {category_subtree_id $subtree_id} \ - {category_object_id {[value_if_exists categorized_object_id]}} \ + {category_object_id {[expr {[info exists categorized_object_id] ? $categorized_object_id : ""}]}} \ {category_assign_single_p $assign_single_p} \ {category_require_category_p $require_category_p} \ {category_widget $widget} \ Index: openacs-4/packages/categories/www/cadmin/category-delete.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/categories/www/cadmin/category-delete.tcl,v diff -u -r1.14 -r1.14.2.1 --- openacs-4/packages/categories/www/cadmin/category-delete.tcl 29 Jun 2018 17:27:18 -0000 1.14 +++ openacs-4/packages/categories/www/cadmin/category-delete.tcl 29 Nov 2019 14:32:04 -0000 1.14.2.1 @@ -39,8 +39,8 @@ set page_title "Delete categories" set context_bar [category::context_bar $tree_id $locale \ - [value_if_exists object_id] \ - [value_if_exists ctx_id]] + [expr {[info exists object_id] ? $object_id : ""}] \ + [expr {[info exists ctx_id] ? $ctx_id : ""}]] lappend context_bar "Delete categories" template::list::create \ Index: openacs-4/packages/categories/www/cadmin/category-form.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/categories/www/cadmin/category-form.tcl,v diff -u -r1.14.2.1 -r1.14.2.2 --- openacs-4/packages/categories/www/cadmin/category-form.tcl 14 Feb 2019 16:15:01 -0000 1.14.2.1 +++ openacs-4/packages/categories/www/cadmin/category-form.tcl 29 Nov 2019 14:32:04 -0000 1.14.2.2 @@ -26,8 +26,8 @@ } set context_bar [category::context_bar $tree_id $locale \ - [value_if_exists object_id] \ - [value_if_exists ctx_id]] + [expr {[info exists object_id] ? $object_id : ""}] \ + [expr {[info exists ctx_id] ? $ctx_id : ""}]] lappend context_bar $page_title set languages [lang::system::get_locale_options] Index: openacs-4/packages/categories/www/cadmin/category-link-add-2.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/categories/www/cadmin/category-link-add-2.tcl,v diff -u -r1.11.2.1 -r1.11.2.2 --- openacs-4/packages/categories/www/cadmin/category-link-add-2.tcl 15 Mar 2019 11:32:16 -0000 1.11.2.1 +++ openacs-4/packages/categories/www/cadmin/category-link-add-2.tcl 29 Nov 2019 14:32:04 -0000 1.11.2.2 @@ -29,8 +29,8 @@ set page_title "Add link from \"$link_tree_name\" to category \"$tree_name :: $category_name\"" set context_bar [category::context_bar $tree_id $locale \ - [value_if_exists object_id] \ - [value_if_exists ctx_id]] + [expr {[info exists object_id] ? $object_id : ""}] \ + [expr {[info exists ctx_id] ? $ctx_id : ""}]] lappend context_bar \ [list [export_vars -no_empty -base category-links-view {category_id tree_id locale object_id ctx_id}] "Links to $category_name"] \ [list [export_vars -no_empty -base category-link-add {category_id tree_id locale object_id ctx_id}] "Select link target"] \ Index: openacs-4/packages/categories/www/cadmin/category-link-add.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/categories/www/cadmin/category-link-add.tcl,v diff -u -r1.7.2.1 -r1.7.2.2 --- openacs-4/packages/categories/www/cadmin/category-link-add.tcl 15 Mar 2019 11:41:37 -0000 1.7.2.1 +++ openacs-4/packages/categories/www/cadmin/category-link-add.tcl 29 Nov 2019 14:32:04 -0000 1.7.2.2 @@ -25,8 +25,8 @@ set page_title "Select target to add a link to category \"$tree_name :: $category_name\"" set context_bar [category::context_bar $tree_id $locale \ - [value_if_exists object_id] \ - [value_if_exists ctx_id]] + [expr {[info exists object_id] ? $object_id : ""}] \ + [expr {[info exists ctx_id] ? $ctx_id : ""}]] lappend context_bar \ [list [export_vars -no_empty -base category-links-view {category_id tree_id locale object_id ctx_id}] "Links to $category_name"] \ "Select link target" Index: openacs-4/packages/categories/www/cadmin/category-link-delete.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/categories/www/cadmin/category-link-delete.tcl,v diff -u -r1.9.2.1 -r1.9.2.2 --- openacs-4/packages/categories/www/cadmin/category-link-delete.tcl 15 Mar 2019 13:31:27 -0000 1.9.2.1 +++ openacs-4/packages/categories/www/cadmin/category-link-delete.tcl 29 Nov 2019 14:32:04 -0000 1.9.2.2 @@ -29,8 +29,8 @@ set page_title "Delete links with category \"$tree_name :: $category_name\"" set context_bar [category::context_bar $tree_id $locale \ - [value_if_exists object_id] \ - [value_if_exists ctx_id]] + [expr {[info exists object_id] ? $object_id : ""}] \ + [expr {[info exists ctx_id] ? $ctx_id : ""}]] lappend context_bar \ [list [export_vars -no_empty -base category-links-view {category_id tree_id locale object_id ctx_id}] "Links to $category_name"] \ "Delete Links" Index: openacs-4/packages/categories/www/cadmin/category-links-view.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/categories/www/cadmin/category-links-view.tcl,v diff -u -r1.11.2.1 -r1.11.2.2 --- openacs-4/packages/categories/www/cadmin/category-links-view.tcl 15 Mar 2019 12:02:14 -0000 1.11.2.1 +++ openacs-4/packages/categories/www/cadmin/category-links-view.tcl 29 Nov 2019 14:32:04 -0000 1.11.2.2 @@ -25,8 +25,8 @@ set page_title "Categories linked with category \"$tree_name :: $category_name\"" set context_bar [category::context_bar $tree_id $locale \ - [value_if_exists object_id] \ - [value_if_exists ctx_id]] + [expr {[info exists object_id] ? $object_id : ""}] \ + [expr {[info exists ctx_id] ? $ctx_id : ""}]] lappend context_bar "Links to $category_name" Index: openacs-4/packages/categories/www/cadmin/category-parent-change.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/categories/www/cadmin/category-parent-change.tcl,v diff -u -r1.8.2.1 -r1.8.2.2 --- openacs-4/packages/categories/www/cadmin/category-parent-change.tcl 29 Nov 2019 14:04:08 -0000 1.8.2.1 +++ openacs-4/packages/categories/www/cadmin/category-parent-change.tcl 29 Nov 2019 14:32:04 -0000 1.8.2.2 @@ -23,8 +23,8 @@ set category_name [category::get_name $category_id $locale] set page_title "Change parent category of \"$category_name\"" set context_bar [category::context_bar $tree_id $locale \ - [value_if_exists object_id] \ - [value_if_exists ctx_id]] + [expr {[info exists object_id] ? $object_id : ""}] \ + [expr {[info exists ctx_id] ? $ctx_id : ""}]] lappend context_bar "Change parent" Index: openacs-4/packages/categories/www/cadmin/category-usage.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/categories/www/cadmin/category-usage.tcl,v diff -u -r1.10.2.2 -r1.10.2.3 --- openacs-4/packages/categories/www/cadmin/category-usage.tcl 15 Mar 2019 16:28:55 -0000 1.10.2.2 +++ openacs-4/packages/categories/www/cadmin/category-usage.tcl 29 Nov 2019 14:32:04 -0000 1.10.2.3 @@ -43,7 +43,7 @@ set page_title "Objects using category \"$category_name\" of tree \"$tree_name\"" set url_vars [export_vars -no_empty {category_id tree_id locale object_id}] -set context_bar [category::context_bar $tree_id $locale [value_if_exists object_id]] +set context_bar [category::context_bar $tree_id $locale [expr {[info exists object_id] ? $object_id : ""}]] lappend context_bar "\"$category_name\" Usage" template::list::create -name items_list -multirow items \ Index: openacs-4/packages/categories/www/cadmin/permission-manage.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/categories/www/cadmin/permission-manage.tcl,v diff -u -r1.9.2.1 -r1.9.2.2 --- openacs-4/packages/categories/www/cadmin/permission-manage.tcl 1 Mar 2019 10:51:02 -0000 1.9.2.1 +++ openacs-4/packages/categories/www/cadmin/permission-manage.tcl 29 Nov 2019 14:32:04 -0000 1.9.2.2 @@ -22,7 +22,7 @@ set tree_name $tree(tree_name) set page_title [_ categories.Permissions_manage_title] -set context_bar [category::context_bar $tree_id $locale [value_if_exists object_id]] +set context_bar [category::context_bar $tree_id $locale [expr {[info exists object_id] ? $object_id : ""}]] lappend context_bar [_ categories.Permissions_manage] set url_vars [export_vars {tree_id object_id locale}] Index: openacs-4/packages/categories/www/cadmin/synonym-delete.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/categories/www/cadmin/synonym-delete.tcl,v diff -u -r1.6 -r1.6.2.1 --- openacs-4/packages/categories/www/cadmin/synonym-delete.tcl 29 Jun 2018 17:27:18 -0000 1.6 +++ openacs-4/packages/categories/www/cadmin/synonym-delete.tcl 29 Nov 2019 14:32:04 -0000 1.6.2.1 @@ -27,8 +27,8 @@ set page_title "Delete synonyms of category \"$tree_name :: $category_name\"" set context_bar [category::context_bar $tree_id $locale \ - [value_if_exists object_id] \ - [value_if_exists ctx_id]] + [expr {[info exists object_id] ? $object_id : ""}] \ + [expr {[info exists ctx_id] ? $ctx_id : ""}]] lappend context_bar [list [export_vars -no_empty -base synonyms-view { category_id tree_id locale object_id ctx_id}] "Synonyms of $category_name"] "Delete synonyms" set delete_url [export_vars -no_empty -base synonym-delete-2 { synonym_id:multiple category_id tree_id locale object_id ctx_id}] Index: openacs-4/packages/categories/www/cadmin/synonym-form.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/categories/www/cadmin/synonym-form.tcl,v diff -u -r1.8 -r1.8.2.1 --- openacs-4/packages/categories/www/cadmin/synonym-form.tcl 29 Jun 2018 17:27:18 -0000 1.8 +++ openacs-4/packages/categories/www/cadmin/synonym-form.tcl 29 Nov 2019 14:32:04 -0000 1.8.2.1 @@ -30,8 +30,8 @@ set page_title "$action category synonym of \"$tree_name :: $category_name\"" set context_bar [category::context_bar $tree_id $locale \ - [value_if_exists object_id] \ - [value_if_exists ctx_id]] + [expr {[info exists object_id] ? $object_id : ""}] \ + [expr {[info exists ctx_id] ? $ctx_id : ""}]] lappend context_bar [list [export_vars -no_empty -base synonyms-view { category_id tree_id locale object_id ctx_id}] "Synonyms of $category_name"] "$action synonym" Index: openacs-4/packages/categories/www/cadmin/synonyms-view.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/categories/www/cadmin/synonyms-view.tcl,v diff -u -r1.8 -r1.8.2.1 --- openacs-4/packages/categories/www/cadmin/synonyms-view.tcl 29 Jun 2018 17:27:18 -0000 1.8 +++ openacs-4/packages/categories/www/cadmin/synonyms-view.tcl 29 Nov 2019 14:32:04 -0000 1.8.2.1 @@ -25,8 +25,8 @@ set page_title "Synonyms for category \"$tree_name :: $category_name\"" set context_bar [category::context_bar $tree_id $locale \ - [value_if_exists object_id] \ - [value_if_exists ctx_id]] + [expr {[info exists object_id] ? $object_id : ""}] \ + [expr {[info exists ctx_id] ? $ctx_id : ""}]] lappend context_bar "Synonyms of $category_name" Index: openacs-4/packages/categories/www/cadmin/tree-copy-view.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/categories/www/cadmin/tree-copy-view.tcl,v diff -u -r1.7 -r1.7.2.1 --- openacs-4/packages/categories/www/cadmin/tree-copy-view.tcl 29 Jun 2018 17:27:18 -0000 1.7 +++ openacs-4/packages/categories/www/cadmin/tree-copy-view.tcl 29 Nov 2019 14:32:04 -0000 1.7.2.1 @@ -31,8 +31,8 @@ set page_title [_ categories.Tree_view_title] set context_bar [category::context_bar $tree_id $locale \ - [value_if_exists object_id] \ - [value_if_exists ctx_id]] + [expr {[info exists object_id] ? $object_id : ""}] \ + [expr {[info exists ctx_id] ? $ctx_id : ""}]] lappend context_bar [list \ [export_vars -no_empty -base tree-copy { {tree_id $target_tree_id} locale object_id ctx_id }] \ [_ categories.Action_copy_tree]] \ Index: openacs-4/packages/categories/www/cadmin/tree-copy.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/categories/www/cadmin/tree-copy.tcl,v diff -u -r1.15.2.1 -r1.15.2.2 --- openacs-4/packages/categories/www/cadmin/tree-copy.tcl 15 Mar 2019 11:21:40 -0000 1.15.2.1 +++ openacs-4/packages/categories/www/cadmin/tree-copy.tcl 29 Nov 2019 14:32:04 -0000 1.15.2.2 @@ -25,8 +25,8 @@ set page_title [_ categories.Tree_copy_title] set context_bar [category::context_bar $tree_id $locale \ - [value_if_exists object_id] \ - [value_if_exists ctx_id]] + [expr {[info exists object_id] ? $object_id : ""}] \ + [expr {[info exists ctx_id] ? $ctx_id : ""}]] lappend context_bar [_ categories.Tree_copy] template::multirow create trees tree_id tree_name site_wide_p view_url copy_url Index: openacs-4/packages/categories/www/cadmin/tree-delete.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/categories/www/cadmin/tree-delete.tcl,v diff -u -r1.14 -r1.14.2.1 --- openacs-4/packages/categories/www/cadmin/tree-delete.tcl 29 Jun 2018 17:27:18 -0000 1.14 +++ openacs-4/packages/categories/www/cadmin/tree-delete.tcl 29 Nov 2019 14:32:04 -0000 1.14.2.1 @@ -30,8 +30,8 @@ set page_title [_ categories.Delete_category_tree_title] set context_bar [category::context_bar $tree_id $locale \ - [value_if_exists object_id] \ - [value_if_exists ctx_id]] + [expr {[info exists object_id] ? $object_id : ""}] \ + [expr {[info exists ctx_id] ? $ctx_id : ""}]] lappend context_bar [_ categories.Delete] set instance_list [category_tree::usage $tree_id] Index: openacs-4/packages/categories/www/cadmin/tree-usage.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/categories/www/cadmin/tree-usage.tcl,v diff -u -r1.13 -r1.13.2.1 --- openacs-4/packages/categories/www/cadmin/tree-usage.tcl 29 Jun 2018 17:27:19 -0000 1.13 +++ openacs-4/packages/categories/www/cadmin/tree-usage.tcl 29 Nov 2019 14:32:04 -0000 1.13.2.1 @@ -31,8 +31,8 @@ set page_title [_ categories.Usage_title] set context_bar [category::context_bar $tree_id $locale \ - [value_if_exists object_id] \ - [value_if_exists ctx_id]] + [expr {[info exists object_id] ? $object_id : ""}] \ + [expr {[info exists ctx_id] ? $ctx_id : ""}]] lappend context_bar [_ categories.Usage]