Index: openacs-4/packages/acs-subsite/www/admin/group-types/new.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/group-types/new.tcl,v
diff -u -r1.7 -r1.7.2.1
--- openacs-4/packages/acs-subsite/www/admin/group-types/new.tcl 19 Jan 2018 14:09:48 -0000 1.7
+++ openacs-4/packages/acs-subsite/www/admin/group-types/new.tcl 13 Mar 2019 11:22:05 -0000 1.7.2.1
@@ -64,8 +64,8 @@
incr exception_count
append exception_text \
"
The specified object type, $object_type, already exists. " \
- [ad_decode $safe_object_type $object_type "" \
- "Note that we converted the object type to \"$safe_object_type\" to ensure that the name would be safe for the database."] \
+ [expr {$safe_object_type eq $object_type ? "" :
+ "Note that we converted the object type to \"$safe_object_type\" to ensure that the name would be safe for the database."}] \
"Please back up and choose another."
} else {
# let's make sure the names are unique
Index: openacs-4/packages/acs-subsite/www/admin/object-types/one.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/object-types/one.tcl,v
diff -u -r1.13 -r1.13.2.1
--- openacs-4/packages/acs-subsite/www/admin/object-types/one.tcl 7 Apr 2018 19:30:45 -0000 1.13
+++ openacs-4/packages/acs-subsite/www/admin/object-types/one.tcl 13 Mar 2019 11:27:53 -0000 1.13.2.1
@@ -28,13 +28,13 @@
- Pretty Name: [lang::util::localize $pretty_name]
- Pretty Plural: [lang::util::localize $pretty_plural]
- - Abstract: [ad_decode $abstract_p "f" "False" "True"]
- - Dynamic: [ad_decode $dynamic_p "f" "False" "True"]
- [ad_decode $table_name "" "" "- Table Name: $table_name
"]
- [ad_decode $id_column "" "" "- Primary Key: $id_column
"]
- [ad_decode $name_method "" "" "- Name Method: $name_method
"]
- [ad_decode $type_extension_table "" "" "- Helper Table: $type_extension_table
"]
- [ad_decode $package_name "" "" "- Package Name: $package_name
"]
+ - Abstract: [expr {$abstract_p ? "True" : "False"}]
+ - Dynamic: [expr {$dynamic_p ? "True" : "False"}]
+ [expr {$table_name eq "" ? "" : "- Table Name: $table_name
"}]
+ [expr {$id_column eq "" ? "" : "- Primary Key: $id_column
"}]
+ [expr {$name_method eq "" ? "" : "- Name Method: $name_method
"}]
+ [expr {$type_extension_table eq "" ? "" : "- Helper Table: $type_extension_table
"}]
+ [expr {$package_name eq "" ? "" : "- Package Name: $package_name
"}]
}]